Mercurial > emacs
changeset 111611:26c02ba5ddb4
* lisp/novice.el (disabled-command-function): Fix 2009-11-15 change. (Bug#7384)
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 13 Nov 2010 01:16:18 -0800 |
| parents | d53ab813a8d6 |
| children | 2529e302a86e |
| files | lisp/ChangeLog lisp/novice.el |
| diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Nov 12 19:03:57 2010 +0200 +++ b/lisp/ChangeLog Sat Nov 13 01:16:18 2010 -0800 @@ -1,3 +1,8 @@ +2010-11-13 Glenn Morris <rgm@gnu.org> + + * novice.el (disabled-command-function): + Fix 2009-11-15 change. (Bug#7384) + 2010-11-12 Glenn Morris <rgm@gnu.org> * calendar/calendar.el (diary-iso-date-forms): Make elements
--- a/lisp/novice.el Fri Nov 12 19:03:57 2010 +0200 +++ b/lisp/novice.el Sat Nov 13 01:16:18 2010 -0800 @@ -1,7 +1,7 @@ ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs -;; Copyright (C) 1985, 1986, 1987, 1994, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1994, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal, help @@ -110,9 +110,9 @@ (not (string= "" user-init-file)) (y-or-n-p "Enable command for future editing sessions also? ")) (enable-command cmd) - (put cmd 'disabled nil))) - (?n nil) - (t (call-interactively cmd))))) + (put cmd 'disabled nil)))) + (or (char-equal char ?n) + (call-interactively cmd)))) (defun en/disable-command (command disable) (unless (commandp command) @@ -169,5 +169,4 @@ (provide 'novice) -;; arch-tag: f83c0f96-497e-4db6-a430-8703716c6dd9 ;;; novice.el ends here