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

it's not needed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index adb5a0af17bbca92c4cd35bfa34a9099dcf6688d..a126b939a1908992c7f80538cd82e2c3af08f3f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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:

diff --git a/lisp/view.el b/lisp/view.el
index a0c020ccf43db05b56ec58c3c8864ef77120e8cd..311d5e3123c64c59728ada791070e22edd800e30 100644 (file)
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -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)))