* shell.el (shell-dirtrack-verbose): New custom variable.

[gnu-emacs] / lisp / view.el

diff --git a/lisp/view.el b/lisp/view.el
index 1f6c8f42ac2becc051a742bc2f724c8a3f49ac68..593d29b6a24a79d6ba3b9197ec28237620fc6e5a 100644 (file)
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -582,7 +582,8 @@ corresponding OLD-WINDOW is a live window, then select OLD-WINDOW."
 (defun View-exit-and-edit ()
   "Exit View mode and make the current buffer editable."
   (interactive)
-  (let ((view-old-buffer-read-only nil))
+  (let ((view-old-buffer-read-only nil)
+       (view-no-disable-on-exit nil))
     (view-mode-exit)))
 
 (defun View-leave ()
@@ -828,7 +829,7 @@ If you don't specify a prefix argument, it uses the number of lines set by
 \\[View-scroll-page-backward-set-page-size].
 If LINES is more than a window-full, only the last window-full is shown."
   (interactive "P")
-  (let ((view-mode-auto-exit nil)
+  (let ((view-scroll-auto-exit nil)
        (view-try-extend-at-buffer-end t))
     (view-scroll-lines lines nil view-page-size nil)))