From 78101c2b5840218933675236062060523bdd163c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 18 Dec 2014 10:25:54 -0500 Subject: [PATCH 1/3] * lisp/subr.el (redisplay-dont-pause): Mark as obsolete. * doc/lispref/display.texi (Forcing Redisplay): Remove references to redisplay-dont-pause and redisplay-preemption-period (which doesn't even exist). --- doc/lispref/ChangeLog | 6 ++++++ doc/lispref/display.texi | 27 +-------------------------- etc/NEWS | 3 +++ lisp/ChangeLog | 4 ++++ lisp/subr.el | 1 + 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index dcab3bac6ed..12554dd2321 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2014-12-18 Stefan Monnier + + * display.texi (Forcing Redisplay): Remove references to + redisplay-dont-pause and redisplay-preemption-period (which doesn't + even exist). + 2014-12-11 Eli Zaretskii * text.texi (Comparing Text): Prevent a text string from being diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 46be5ecf3f0..c4753ecbb2a 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -85,10 +85,7 @@ waiting for input. @defun redisplay &optional force This function tries immediately to redisplay. The optional argument @var{force}, if non-@code{nil}, forces the redisplay to be performed, -instead of being preempted, even if input is pending and the variable -@code{redisplay-dont-pause} is @code{nil} (see below). If -@code{redisplay-dont-pause} is non-@code{nil} (the default), this -function redisplays in any case, i.e., @var{force} does nothing. +instead of being preempted if input is pending. The function returns @code{t} if it actually tried to redisplay, and @code{nil} otherwise. A value of @code{t} does not mean that @@ -96,28 +93,6 @@ redisplay proceeded to completion; it could have been preempted by newly arriving input. @end defun -@defvar redisplay-dont-pause -If this variable is @code{nil}, arriving input events preempt -redisplay; Emacs avoids starting a redisplay, and stops any redisplay -that is in progress, until the input has been processed. In -particular, @code{(redisplay)} returns @code{nil} without actually -redisplaying, if there is pending input. - -The default value is @code{t}, which means that pending input does not -preempt redisplay. -@end defvar - -@defvar redisplay-preemption-period -If @code{redisplay-dont-pause} is @code{nil}, this variable specifies -how many seconds Emacs waits between checks for new input during -redisplay; if input arrives during this interval, redisplay stops and -the input is processed. The default value is 0.1; if the value is -@code{nil}, Emacs does not check for input during redisplay. - -This variable has no effect when @code{redisplay-dont-pause} is -non-@code{nil} (the default). -@end defvar - @defvar pre-redisplay-function A function run just before redisplay. It is called with one argument, the set of windows to redisplay. diff --git a/etc/NEWS b/etc/NEWS index 3d580ee36c4..b34bca865a2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -27,6 +27,9 @@ otherwise leave it unmarked. --- ** The default value of `history-length' has increased to 100. ++++ +** `redisplay-dont-pause' is declared as obsolete. + * Changes in Specialized Modes and Packages in Emacs 24.5 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a7fe33204d1..34c335c663b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-18 Stefan Monnier + + * subr.el (redisplay-dont-pause): Mark as obsolete. + 2014-12-17 Michael Albinus * net/tramp.el (tramp-error-with-buffer): Call `message' properly. diff --git a/lisp/subr.el b/lisp/subr.el index 839b9159519..0a8b24051ea 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1292,6 +1292,7 @@ is converted into a string by expressing it in decimal." (make-obsolete-variable 'redisplay-end-trigger-functions 'jit-lock-register "23.1") (make-obsolete-variable 'deferred-action-list 'post-command-hook "24.1") (make-obsolete-variable 'deferred-action-function 'post-command-hook "24.1") +(make-obsolete-variable 'redisplay-dont-pause nil "24.5") (make-obsolete 'window-redisplay-end-trigger nil "23.1") (make-obsolete 'set-window-redisplay-end-trigger nil "23.1") From 811aceeaef8d436bdecbbb2f87bcdbefeb0cdfd0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 18 Dec 2014 19:15:01 +0200 Subject: [PATCH 2/3] src/window.c (Fwindow_body_width): Doc fix. (Bug#19395) --- src/ChangeLog | 4 ++++ src/window.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c0b9039c339..d6de89a9d50 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-12-18 Eli Zaretskii + + * window.c (Fwindow_body_width): Doc fix. (Bug#19395) + 2014-12-15 Stefan Monnier * buffer.c (syms_of_buffer) : fix docstring. diff --git a/src/window.c b/src/window.c index 6938ffb8cb8..ccd714ae12e 100644 --- a/src/window.c +++ b/src/window.c @@ -973,7 +973,10 @@ or scroll bars. If PIXELWISE is nil, return the largest integer smaller than WINDOW's pixel width divided by the character width of WINDOW's frame. This means that if a column at the right of the text area is only partially -visible, that column is not counted. */) +visible, that column is not counted. + +Note that the returned value includes the column reserved for the +continuation glyph. */) (Lisp_Object window, Lisp_Object pixelwise) { return make_number (window_body_width (decode_live_window (window), From a864bfb57c8445156dbe7e30b0348d9896c27b28 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 19 Dec 2014 11:47:51 +0100 Subject: [PATCH 3/3] Fix content decoding in gnus-read-ephemeral-bug-group * gnus-group.el (gnus-read-ephemeral-bug-group): Bind coding-system-for-read and coding-system-for-write only around with-temp-file, and make buffer unibyte. Don't write temp file twice. --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/gnus-group.el | 42 ++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 3b2a702a69e..f69d3503a92 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2014-12-19 Andreas Schwab + + * gnus-group.el (gnus-read-ephemeral-bug-group): Bind + coding-system-for-read and coding-system-for-write only around + with-temp-file, and make buffer unibyte. Don't write temp file twice. + 2014-11-26 John Mastro (tiny change) * auth-source.el (auth-source-macos-keychain-search-items): Return diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index d8260b40434..a7e3d30a22a 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2459,27 +2459,27 @@ the bug number, and browsing the URL must return mbox output." (setq ids (string-to-number ids))) (unless (listp ids) (setq ids (list ids))) - (let ((tmpfile (mm-make-temp-file "gnus-temp-group-")) - (coding-system-for-write 'binary) - (coding-system-for-read 'binary)) - (with-temp-file tmpfile - (dolist (id ids) - (url-insert-file-contents (format mbox-url id))) - (goto-char (point-min)) - ;; Add the debbugs address so that we can respond to reports easily. - (while (re-search-forward "^To: " nil t) - (end-of-line) - (insert (format ", %s@%s" (car ids) - (gnus-replace-in-string - (gnus-replace-in-string mbox-url "^http://" "") - "/.*$" "")))) - (write-region (point-min) (point-max) tmpfile) - (gnus-group-read-ephemeral-group - (format "nndoc+ephemeral:bug#%s" - (mapconcat 'number-to-string ids ",")) - `(nndoc ,tmpfile - (nndoc-article-type mbox)) - nil window-conf)) + (let ((tmpfile (mm-make-temp-file "gnus-temp-group-"))) + (let ((coding-system-for-write 'binary) + (coding-system-for-read 'binary)) + (with-temp-file tmpfile + (set-buffer-multibyte nil) + (dolist (id ids) + (url-insert-file-contents (format mbox-url id))) + (goto-char (point-min)) + ;; Add the debbugs address so that we can respond to reports easily. + (while (re-search-forward "^To: " nil t) + (end-of-line) + (insert (format ", %s@%s" (car ids) + (gnus-replace-in-string + (gnus-replace-in-string mbox-url "^http://" "") + "/.*$" "")))))) + (gnus-group-read-ephemeral-group + (format "nndoc+ephemeral:bug#%s" + (mapconcat 'number-to-string ids ",")) + `(nndoc ,tmpfile + (nndoc-article-type mbox)) + nil window-conf) (delete-file tmpfile))) (defun gnus-read-ephemeral-debian-bug-group (number)