* lisp/novice.el (disabled-command-function): Fix 2009-11-15 change. (Bug#7384)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ee83dbe2cb101a42ff8e6ad27c56154f2277277..a86be12849941680863b19d135ec01ee955e063e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/novice.el b/lisp/novice.el
index c7cbccfa02c6a5c946a635e108d8d876e8c8105f..47b32fcde8ae4354608e7e7f5b2694ac75b99a64 100644 (file)
--- 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