summaryrefslogtreecommitdiff
path: root/lisp/novice.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-11-13 01:16:18 -0800
committerGlenn Morris <rgm@gnu.org>2010-11-13 01:16:18 -0800
commitf0a698ab85a0eec6e720e7a5f12ac5cfdfd8857d (patch)
tree9af60cb918fa2a3503648647873060fec4e61146 /lisp/novice.el
parent5b05d75ba700fea16eb4f0e8d2e6ce7bd249dfe1 (diff)
downloademacs-f0a698ab85a0eec6e720e7a5f12ac5cfdfd8857d.tar.gz
* lisp/novice.el (disabled-command-function): Fix 2009-11-15 change. (Bug#7384)
Diffstat (limited to 'lisp/novice.el')
-rw-r--r--lisp/novice.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/novice.el b/lisp/novice.el
index c7cbccfa02c..47b32fcde8a 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -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 @@ SPC to try the command just this once, but leave it disabled.
(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 @@ to future sessions."
(provide 'novice)
-;; arch-tag: f83c0f96-497e-4db6-a430-8703716c6dd9
;;; novice.el ends here