* 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).

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index dcab3bac6ed0cacbb7e38eca366dad3fcb32e84e..12554dd232195a812986dfdf38328d168c70b78f 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * display.texi (Forcing Redisplay): Remove references to
+       redisplay-dont-pause and redisplay-preemption-period (which doesn't
+       even exist).
+
 2014-12-11  Eli Zaretskii  <eliz@gnu.org>
 
        * text.texi (Comparing Text): Prevent a text string from being

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 46be5ecf3f032d7132365ca87d61dd68c66b094a..c4753ecbb2a647ea913ffd5c07c50ecb8a29e905 100644 (file)
--- 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 3d580ee36c4ea1ef3057c504ad1e48725c14715d..b34bca865a22b92fa5ee069c5fc384114ecdefec 100644 (file)
--- 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.
+
 \f
 * Changes in Specialized Modes and Packages in Emacs 24.5
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7fe33204d10a56441e1f1c5e4500f9bbdc9fcf7..34c335c663bcc26d6ebc55a8b0bb9c76b2902e30 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (redisplay-dont-pause): Mark as obsolete.
+
 2014-12-17  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-error-with-buffer): Call `message' properly.

diff --git a/lisp/subr.el b/lisp/subr.el
index 839b91595196ec073b31ae3f1beb823ba45cf1ef..0a8b24051ea954200d9ef2828ee34206d48202b9 100644 (file)
--- 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")