[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog view.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog view.el |
Date: |
Sun, 26 Jul 2009 23:06:54 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/07/26 23:06:53
Modified files:
lisp : ChangeLog view.el
Log message:
* view.el (view-mode-enable): Don't define Helper-return-blurb if
it's not needed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15859&r2=1.15860
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/view.el?cvsroot=emacs&r1=1.103&r2=1.104
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15859
retrieving revision 1.15860
diff -u -b -r1.15859 -r1.15860
--- ChangeLog 25 Jul 2009 09:31:07 -0000 1.15859
+++ ChangeLog 26 Jul 2009 23:06:49 -0000 1.15860
@@ -1,3 +1,8 @@
+2009-07-26 Chong Yidong <address@hidden>
+
+ * view.el (view-mode-enable): Don't define Helper-return-blurb if
+ it's not needed.
+
2009-07-25 Eli Zaretskii <address@hidden>
Fix Bug#3888:
Index: view.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/view.el,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- view.el 26 May 2009 18:19:31 -0000 1.103
+++ view.el 26 Jul 2009 23:06:53 -0000 1.104
@@ -120,9 +120,6 @@
(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 @@
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)
+ 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))))
+ (buffer-name)))))
(force-mode-line-update)
(run-hooks 'view-mode-hook))
@@ -516,8 +514,9 @@
;; 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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog view.el,
Chong Yidong <=