HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace "Maintainer: FSF" with the emacs-devel mailing address
[bpt/emacs.git]
/
lisp
/
novice.el
diff --git
a/lisp/novice.el
b/lisp/novice.el
index
47b32fc
..
46727d3
100644
(file)
--- a/
lisp/novice.el
+++ b/
lisp/novice.el
@@
-1,9
+1,9
@@
;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
;;; 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
-1987, 1994, 2001-2014 Free Software Foundation
,
+;; Inc.
-;; Maintainer:
FSF
+;; Maintainer:
emacs-devel@gnu.org
;; Keywords: internal, help
;; This file is part of GNU Emacs.
;; Keywords: internal, help
;; This file is part of GNU Emacs.
@@
-34,16
+34,14
@@
;; The command is found in this-command
;; and the keys are returned by (this-command-keys).
;; The command is found in this-command
;; and the keys are returned by (this-command-keys).
-(eval-when-compile (require 'cl))
-
+;;;###autoload
+(define-obsolete-variable-alias 'disabled-command-hook
+ 'disabled-command-function "22.1")
;;;###autoload
(defvar disabled-command-function 'disabled-command-function
"Function to call to handle disabled commands.
If nil, the feature is disabled, i.e., all commands work normally.")
;;;###autoload
(defvar disabled-command-function 'disabled-command-function
"Function to call to handle disabled commands.
If nil, the feature is disabled, i.e., all commands work normally.")
-;;;###autoload
-(define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1")
-
;; It is ok here to assume that this-command is a symbol
;; because we won't get called otherwise.
;;;###autoload
;; It is ok here to assume that this-command is a symbol
;; because we won't get called otherwise.
;;;###autoload
@@
-52,7
+50,6
@@
If nil, the feature is disabled, i.e., all commands work normally.")
(unless keys (setq keys (this-command-keys)))
(let (char)
(save-window-excursion
(unless keys (setq keys (this-command-keys)))
(let (char)
(save-window-excursion
- (help-setup-xref (list 'disabled-command-function cmd keys) nil)
(with-output-to-temp-buffer "*Disabled Command*" ;; (help-buffer)
(if (or (eq (aref keys 0)
(if (stringp keys)
(with-output-to-temp-buffer "*Disabled Command*" ;; (help-buffer)
(if (or (eq (aref keys 0)
(if (stringp keys)
@@
-102,7
+99,7
@@
SPC to try the command just this once, but leave it disabled.
(ding)
(message "Please type y, n, ! or SPC (the space bar): "))))
(setq char (downcase char))
(ding)
(message "Please type y, n, ! or SPC (the space bar): "))))
(setq char (downcase char))
- (case char
+ (
p
case char
(?\C-g (setq quit-flag t))
(?! (setq disabled-command-function nil))
(?y
(?\C-g (setq quit-flag t))
(?! (setq disabled-command-function nil))
(?y
@@
-162,8
+159,8
@@
to future sessions."
(defun disable-command (command)
"Require special confirmation to execute COMMAND from now on.
COMMAND must be a symbol.
(defun disable-command (command)
"Require special confirmation to execute COMMAND from now on.
COMMAND must be a symbol.
-This command alters
the user's .emacs file so that this will apply
-
to
future sessions."
+This command alters
your init file so that this choice applies to
+future sessions."
(interactive "CDisable command: ")
(en/disable-command command t))
(interactive "CDisable command: ")
(en/disable-command command t))