[Emacs-diffs] emacs/lisp ChangeLog view.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/11/01 09:48:02

Modified files:
        lisp           : ChangeLog view.el 

Log message:
        (view-mode-exit): If OLD-BUF is dead bury the buffer
        instead of deleting the window or frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16539&r2=1.16540
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/view.el?cvsroot=emacs&r1=1.106&r2=1.107

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16539
retrieving revision 1.16540
diff -u -b -r1.16539 -r1.16540
--- ChangeLog   31 Oct 2009 21:52:53 -0000      1.16539
+++ ChangeLog   1 Nov 2009 09:47:58 -0000       1.16540
@@ -1,3 +1,8 @@
+2009-11-01  Andreas Schwab  <address@hidden>
+
+       * view.el (view-mode-exit): If OLD-BUF is dead bury the buffer
+       instead of deleting the window or frame.
+
 2009-10-31  Chong Yidong  <address@hidden>
 
        * textmodes/sgml-mode.el (sgml-mode-facemenu-add-face-function):

Index: view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/view.el,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- view.el     24 Sep 2009 01:37:19 -0000      1.106
+++ view.el     1 Nov 2009 09:48:02 -0000       1.107
@@ -660,11 +660,13 @@
                (old-buf-info (cdr (cdr (car alist)))))
            (if all-win (select-window window))
            (cond
-            ((and (consp old-buf-info)         ; Case 3.
-                  (buffer-live-p (car old-buf-info)))
+            ((consp old-buf-info)              ; Case 3.
+             (if (buffer-live-p (car old-buf-info))
+                 (progn
              (set-window-buffer window (car old-buf-info)) ; old-buf
              (set-window-start window (car (cdr old-buf-info)))
              (set-window-point window (car (cdr (cdr old-buf-info)))))
+               (bury-buffer)))
             ((eq old-buf-info 'quit-window)
              (quit-window))                    ; Case 4.
             (old-buf-info                      ; Case 2 or 5.