[Emacs-diffs] emacs-24 09ab6fe 2/2: Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

[Michael Albinus]

branch: emacs-24
commit 09ab6fedb2314ad1f6ef1cac8643e4b75d4798a2
Merge: 2616307 a864bfb
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24
    
    Conflicts:
        lisp/ChangeLog
---
 doc/lispref/ChangeLog    |    6 ++++++
 doc/lispref/display.texi |   27 +--------------------------
 etc/NEWS                 |    3 +++
 lisp/gnus/ChangeLog      |    6 ++++++
 lisp/gnus/gnus-group.el  |   42 +++++++++++++++++++++---------------------
 lisp/subr.el             |    1 +
 src/ChangeLog            |    4 ++++
 src/window.c             |    5 ++++-
 8 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index dcab3ba..12554dd 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-18  Stefan Monnier  <address@hidden>
+
+       * display.texi (Forcing Redisplay): Remove references to
+       redisplay-dont-pause and redisplay-preemption-period (which doesn't
+       even exist).
+
 2014-12-11  Eli Zaretskii  <address@hidden>
 
        * text.texi (Comparing Text): Prevent a text string from being
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 46be5ec..c4753ec 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 address@hidden, forces the redisplay to be performed,
-instead of being preempted, even if input is pending and the variable
address@hidden is @code{nil} (see below).  If
address@hidden is address@hidden (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
 
address@hidden 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.
address@hidden defvar
-
address@hidden 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
address@hidden, Emacs does not check for input during redisplay.
-
-This variable has no effect when @code{redisplay-dont-pause} is
address@hidden (the default).
address@hidden 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 3d580ee..b34bca8 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/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3b2a702..f69d350 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-19  Andreas Schwab  <address@hidden>
+
+       * 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 <address@hidden>  (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 d8260b4..a7e3d30 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 ", address@hidden" (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 ", address@hidden" (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)
diff --git a/lisp/subr.el b/lisp/subr.el
index 839b915..0a8b240 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")
 
diff --git a/src/ChangeLog b/src/ChangeLog
index c0b9039..d6de89a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-18  Eli Zaretskii  <address@hidden>
+
+       * window.c (Fwindow_body_width): Doc fix.  (Bug#19395)
+
 2014-12-15  Stefan Monnier  <address@hidden>
 
        * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
diff --git a/src/window.c b/src/window.c
index 6938ffb..ccd714a 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),