mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

* view.el (view-mode-enable): Don't define Helper-return-blurb if

Browse Source 
it's not needed.
This commit is contained in:
Chong Yidong 2009-07-26 23:06:49 +00:00
parent e343066fb1
commit 5704140c4d
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2009-07-26 Chong Yidong <cyd@stupidchicken.com>
* view.el (view-mode-enable): Don't define Helper-return-blurb if
it's not needed.
2009-07-25 Eli Zaretskii <eliz@gnu.org>
Fix Bug#3888:

25
lisp/view.el
View File

@ -120,9 +120,6 @@ functions that enable or disable view mode.")
(defvar view-old-Helper-return-blurb)
(make-variable-buffer-local 'view-old-Helper-return-blurb)
;; Just to avoid warnings.
(defvar Helper-return-blurb)
(defvar view-page-size nil
"Default number of lines to scroll by View page commands.
If nil that means use the window size.")
@ -492,14 +489,15 @@ Entry to view-mode runs the normal hook `view-mode-hook'."
view-page-size nil
view-half-page-size nil
view-old-buffer-read-only buffer-read-only
buffer-read-only t
view-old-Helper-return-blurb (and (boundp 'Helper-return-blurb)
Helper-return-blurb)
Helper-return-blurb
(format "continue viewing %s"
(if (buffer-file-name)
(file-name-nondirectory (buffer-file-name))
(buffer-name))))
buffer-read-only t)
(if (boundp 'Helper-return-blurb)
(setq view-old-Helper-return-blurb (and (boundp 'Helper-return-blurb)
Helper-return-blurb)
Helper-return-blurb
(format "continue viewing %s"
(if (buffer-file-name)
(file-name-nondirectory (buffer-file-name))
(buffer-name)))))
(force-mode-line-update)
(run-hooks 'view-mode-hook))
@ -516,8 +514,9 @@ Entry to view-mode runs the normal hook `view-mode-hook'."
;; so that View mode stays off if toggle-read-only is called.
(if (local-variable-p 'view-read-only)
(kill-local-variable 'view-read-only))
(setq view-mode nil
Helper-return-blurb view-old-Helper-return-blurb)
(setq view-mode nil)
(if (boundp 'Helper-return-blurb)
(setq Helper-return-blurb view-old-Helper-return-blurb))
(if buffer-read-only
(setq buffer-read-only view-old-buffer-read-only)))