[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100206: * lisp/novice.el (disabled-command-function): Fix 2009-11-15 change. (Bug#7384)

[Glenn Morris]

------------------------------------------------------------
revno: 100206
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-11-13 01:16:18 -0800
message:
  * lisp/novice.el (disabled-command-function): Fix 2009-11-15 change.  
(Bug#7384)
modified:
  lisp/ChangeLog
  lisp/novice.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-12 03:16:20 +0000
+++ b/lisp/ChangeLog    2010-11-13 09:16:18 +0000
@@ -1,3 +1,8 @@
+2010-11-13  Glenn Morris  <address@hidden>
+
+       * novice.el (disabled-command-function):
+       Fix 2009-11-15 change.  (Bug#7384)
+
 2010-11-12  Glenn Morris  <address@hidden>
 
        * calendar/calendar.el (diary-iso-date-forms): Make elements

=== modified file 'lisp/novice.el'
--- a/lisp/novice.el    2010-01-13 08:35:10 +0000
+++ b/lisp/novice.el    2010-11-13 09:16:18 +0000
@@ -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