(split-window-save-restore-data):

Don't update the data if OLD-INFO is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 232173168c0d04f9b363960c36a56ab7f101c3be..8ba6c959b014708cd562ad68e27eb40102aed21a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2004-04-20  Richard M. Stallman  <rms@gnu.org>
+
+       * window.el (split-window-save-restore-data): 
+       Don't update the data if OLD-INFO is nil.
+
+       * view.el (view-return-to-alist): Mark it permanent local.
+
+       * subr.el (event-modifiers): Fix the criterion for ASCII control chars.
+
+       * recentf.el (recentf-save-list): Catch and warn about errors.
+
+       * menu-bar.el (menu-bar-update-buffers): Call copy-sequence
+       so "Buffers" won't be pure.
+
+       * help-mode.el (help-mode-finish): Set help-return-alist first
+       thing, setting only the entry for the selected window.
+
+       * help-fns.el (describe-function-1): If many non-control non-meta
+       keys run the command, don't list all of them.
+
 2004-04-20  Juanma Barranquero  <lektu@terra.es>
 
        * vc-svn.el (vc-svn-print-log, vc-svn-diff): Add optional BUFFER

diff --git a/lisp/window.el b/lisp/window.el
index 91b91cfb158766a10f3a1d3353eb33e170a76c7d..2b5a4ab161d3c0b2f5ce8a9f9fb7a62f00560a28 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -327,8 +327,9 @@ new mode line."
   (with-current-buffer (window-buffer)
     (if view-mode
        (let ((old-info (assq old-w view-return-to-alist)))
-         (push (cons new-w (cons (and old-info (car (cdr old-info))) t))
-               view-return-to-alist)))
+         (if old-info
+             (push (cons new-w (cons (car (cdr old-info)) t))
+                   view-return-to-alist))))
     new-w))
 
 (defun split-window-horizontally (&optional arg)