[Emacs-diffs] Changes to emacs/lisp/novice.el

[Richard M . Stallman]

Index: emacs/lisp/novice.el
diff -c emacs/lisp/novice.el:1.37 emacs/lisp/novice.el:1.38
*** emacs/lisp/novice.el:1.37   Wed Feb 16 09:48:29 2005
--- emacs/lisp/novice.el        Sun Mar  6 18:29:10 2005
***************
*** 49,55 ****
  (defun disabled-command-function (&rest ignore)
    (let (char)
      (save-window-excursion
!      (with-output-to-temp-buffer "*Help*"
         (let ((keys (this-command-keys)))
         (if (or (eq (aref keys 0)
                     (if (stringp keys)
--- 49,55 ----
  (defun disabled-command-function (&rest ignore)
    (let (char)
      (save-window-excursion
!      (with-output-to-temp-buffer "*Disabled Command*"
         (let ((keys (this-command-keys)))
         (if (or (eq (aref keys 0)
                     (if (stringp keys)
***************
*** 68,74 ****
         (princ "It is disabled because new users often find it confusing.\n")
         (princ "Here's the first part of its description:\n\n")
         ;; Keep only the first paragraph of the documentation.
!        (with-current-buffer "*Help*"
           (goto-char (point-max))
           (let ((start (point)))
             (save-excursion
--- 68,74 ----
         (princ "It is disabled because new users often find it confusing.\n")
         (princ "Here's the first part of its description:\n\n")
         ;; Keep only the first paragraph of the documentation.
!        (with-current-buffer "*Disabled Command*"
           (goto-char (point-max))
           (let ((start (point)))
             (save-excursion
***************
*** 91,100 ****
        (help-mode)))
       (message "Type y, n, ! or SPC (the space bar): ")
       (let ((cursor-in-echo-area t))
!        (while (not (memq (setq char (downcase (read-char)))
!                        '(?! ?y ?n ?\ )))
         (ding)
         (message "Please type y, n, ! or SPC (the space bar): "))))
      (if (= char ?!)
        (setq disabled-command-function nil))
      (if (= char ?y)
--- 91,105 ----
        (help-mode)))
       (message "Type y, n, ! or SPC (the space bar): ")
       (let ((cursor-in-echo-area t))
!        (while (progn (setq char (read-event))
!                    (or (not (numberp char))
!                        (not (memq (downcase char)
!                                   '(?! ?y ?n ?\  ?\C-g)))))
         (ding)
         (message "Please type y, n, ! or SPC (the space bar): "))))
+     (setq char (downcase char))
+     (if (= char ?\C-g)
+       (setq quit-flag t))
      (if (= char ?!)
        (setq disabled-command-function nil))
      (if (= char ?y)