aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97db7c2509..b939374d03 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-27 Dan Nicolaescu <[email protected]>
+
+ * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Fix predicate.
+
2008-03-27 Stefan Monnier <[email protected]>
* vc-hooks.el (vc-before-save): Don't prevent saving the file.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 29552a7dcd..d264de6834 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -281,7 +281,7 @@
(define-key map [menu-bar emacs-lisp] (cons "Emacs-Lisp" menu-map))
(define-key menu-map [eldoc]
'(menu-item "Auto-Display Documentation Strings" eldoc-mode
- :button (:toggle . eldoc-mode)
+ :button (:toggle . (bound-and-true-p eldoc-mode))
:help "Display the documentation string for the item under cursor"))
(define-key menu-map [checkdoc]
'(menu-item "Check Documentation Strings" checkdoc