aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Guerry2008-03-06 17:15:47 +0000
committerBastien Guerry2008-03-06 17:15:47 +0000
commita218ab178b3814366daf920d89a8ec71e2b1c33c (patch)
treed32f7d79a6bc3d2c11d39dbda11778ede8cf0553
parent403d0c9679f56c71616a428f1b049f9ba724831a (diff)
downloademacs-a218ab178b3814366daf920d89a8ec71e2b1c33c.tar.gz
emacs-a218ab178b3814366daf920d89a8ec71e2b1c33c.zip
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Bugfix: replaced
:enable (mark-active) with :enable mark-active. Thanks to Lennart Borgman.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/lisp-mode.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95dad7bab30..35ccfd82c6e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-03-06 Lennart Borgman <lennart.borgman@gmail.com> (tiny change)
2
3 * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Bugfix: replaced
4 :enable (mark-active) with :enable mark-active.
5
12008-03-06 Juanma Barranquero <lekktu@gmail.com> 62008-03-06 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * vms-patch.el (make-legal-file-name): New obsolete alias. 8 * vms-patch.el (make-legal-file-name): New obsolete alias.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index c73a10607a0..054c6419085 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -298,7 +298,7 @@
298 (define-key menu-map [eval-region] 298 (define-key menu-map [eval-region]
299 '(menu-item "Evaluate Region" eval-region 299 '(menu-item "Evaluate Region" eval-region
300 :help "Execute the region as Lisp code" 300 :help "Execute the region as Lisp code"
301 :enable (mark-active))) 301 :enable mark-active))
302 (define-key menu-map [eval-sexp] 302 (define-key menu-map [eval-sexp]
303 '(menu-item "Evaluate Last S-expression" eval-last-sexp 303 '(menu-item "Evaluate Last S-expression" eval-last-sexp
304 :help "Evaluate sexp before point; print value in minibuffer")) 304 :help "Evaluate sexp before point; print value in minibuffer"))
@@ -306,11 +306,11 @@
306 (define-key menu-map [comment-region] 306 (define-key menu-map [comment-region]
307 '(menu-item "Comment Out Region" comment-region 307 '(menu-item "Comment Out Region" comment-region
308 :help "Comment or uncomment each line in the region" 308 :help "Comment or uncomment each line in the region"
309 :enable (mark-active))) 309 :enable mark-active))
310 (define-key menu-map [indent-region] 310 (define-key menu-map [indent-region]
311 '(menu-item "Indent Region" indent-region 311 '(menu-item "Indent Region" indent-region
312 :help "Indent each nonblank line in the region" 312 :help "Indent each nonblank line in the region"
313 :enable (mark-active))) 313 :enable mark-active))
314 (define-key menu-map [indent-line] '("Indent Line" . lisp-indent-line)) 314 (define-key menu-map [indent-line] '("Indent Line" . lisp-indent-line))
315 map) 315 map)
316 "Keymap for Emacs Lisp mode. 316 "Keymap for Emacs Lisp mode.