annotate lisp/novice.el @ 97066:56e49e6c5c52

* xdisp.c (redisplay_window): Check return value of compute_window_start_on_continuation_line before forcing a window start.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 28 Jul 2008 19:36:56 +0000
parents ee5932bf781d
children a9dc0e7c3f2b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38412
253f761ad37b Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents: 37899
diff changeset
1 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 282
diff changeset
2
74442
b2e5081b9320 Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 74240
diff changeset
3 ;; Copyright (C) 1985, 1986, 1987, 1994, 2001, 2002, 2003, 2004,
79721
73661ddc7ac7 Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
845
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 814
diff changeset
5
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
6 ;; Maintainer: FSF
814
38b2499cb3e9 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
7 ;; Keywords: internal, help
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
8
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
10
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
14 ;; (at your option) any later version.
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
15
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
20
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
23
2308
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
24 ;;; Commentary:
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
25
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
26 ;; This mode provides a hook which is, by default, attached to various
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
27 ;; putatively dangerous commands in a (probably futile) attempt to
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
28 ;; prevent lusers from shooting themselves in the feet.
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
29
2232
4f9d60f7de9d Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 845
diff changeset
30 ;;; Code:
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
31
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
32 ;; This function is called (by autoloading)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
33 ;; to handle any disabled command.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
34 ;; The command is found in this-command
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
35 ;; and the keys are returned by (this-command-keys).
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
36
256
7e4c7ef44243 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 36
diff changeset
37 ;;;###autoload
56623
c8c558c4f4a7 (disabled-command-function): New variable renamed from
Luc Teirlinck <teirllm@auburn.edu>
parents: 56569
diff changeset
38 (defvar disabled-command-function 'disabled-command-function
16649
8a01398a26e6 (disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents: 14169
diff changeset
39 "Function to call to handle disabled commands.
8a01398a26e6 (disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents: 14169
diff changeset
40 If nil, the feature is disabled, i.e., all commands work normally.")
268
2dd411fe2f72 *** empty log message ***
Brian Preble <rassilon@gnu.org>
parents: 256
diff changeset
41
60100
3fbab2787d99 (disabled-command-hook): Autoload the defalias
Richard M. Stallman <rms@gnu.org>
parents: 59996
diff changeset
42 ;;;###autoload
64513
d96725e9e9a8 (disabled-command-hook): Declare it with `define-obsolete-variable-alias'.
Juanma Barranquero <lekktu@gmail.com>
parents: 64091
diff changeset
43 (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1")
56623
c8c558c4f4a7 (disabled-command-function): New variable renamed from
Luc Teirlinck <teirllm@auburn.edu>
parents: 56569
diff changeset
44
72718
240ffd11cdc0 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 68651
diff changeset
45 ;; It is ok here to assume that this-command is a symbol
240ffd11cdc0 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 68651
diff changeset
46 ;; because we won't get called otherwise.
282
341f07a24b10 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 268
diff changeset
47 ;;;###autoload
56623
c8c558c4f4a7 (disabled-command-function): New variable renamed from
Luc Teirlinck <teirllm@auburn.edu>
parents: 56569
diff changeset
48 (defun disabled-command-function (&rest ignore)
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
49 (let (char)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
50 (save-window-excursion
60460
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
51 (with-output-to-temp-buffer "*Disabled Command*"
10695
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
52 (let ((keys (this-command-keys)))
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
53 (if (or (eq (aref keys 0)
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
54 (if (stringp keys)
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
55 (aref "\M-x" 0)
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
56 ?\M-x))
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
57 (and (>= (length keys) 2)
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
58 (eq (aref keys 0) meta-prefix-char)
1a97dea087d1 (disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents: 10216
diff changeset
59 (eq (aref keys 1) ?x)))
43077
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
60 (princ (format "You have invoked the disabled command %s.\n"
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
61 (symbol-name this-command)))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
62 (princ (format "You have typed %s, invoking disabled command %s.\n"
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
63 (key-description keys) (symbol-name this-command)))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
64 ;; Print any special message saying why the command is disabled.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
65 (if (stringp (get this-command 'disabled))
43077
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
66 (princ (get this-command 'disabled))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
67 (princ "It is disabled because new users often find it confusing.\n")
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
68 (princ "Here's the first part of its description:\n\n")
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
69 ;; Keep only the first paragraph of the documentation.
60460
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
70 (with-current-buffer "*Disabled Command*"
43077
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
71 (goto-char (point-max))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
72 (let ((start (point)))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
73 (save-excursion
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
74 (princ (or (condition-case ()
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
75 (documentation this-command)
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
76 (error nil))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
77 "<< not documented >>")))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
78 (if (search-forward "\n\n" nil t)
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
79 (delete-region (match-beginning 0) (point-max)))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
80 (goto-char (point-max))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
81 (indent-rigidly start (point) 3))))
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
82 (princ "\n\nDo you want to use this command anyway?\n\n")
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
83 (princ "You can now type
44052
28bd7ea81b05 (disabled-command-hook): Clarify output text to match prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 43077
diff changeset
84 y to try it and enable it (no questions if you use it again).
28bd7ea81b05 (disabled-command-hook): Clarify output text to match prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 43077
diff changeset
85 n to cancel--don't try the command, and it remains disabled.
43077
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
86 SPC to try the command just this once, but leave it disabled.
1983a485a15f (disabled-command-hook): Clarify output text.
Richard M. Stallman <rms@gnu.org>
parents: 43059
diff changeset
87 ! to try it, and enable all disabled commands for this session only.")
9849
430b8cf09515 (disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents: 7300
diff changeset
88 (save-excursion
81755
0e1206aba797 (disabled-command-function): Fit window to buffer to
Martin Rudalics <rudalics@gmx.at>
parents: 75347
diff changeset
89 (set-buffer standard-output)
0e1206aba797 (disabled-command-function): Fit window to buffer to
Martin Rudalics <rudalics@gmx.at>
parents: 75347
diff changeset
90 (help-mode)))
0e1206aba797 (disabled-command-function): Fit window to buffer to
Martin Rudalics <rudalics@gmx.at>
parents: 75347
diff changeset
91 (fit-window-to-buffer (get-buffer-window "*Disabled Command*"))
44052
28bd7ea81b05 (disabled-command-hook): Clarify output text to match prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 43077
diff changeset
92 (message "Type y, n, ! or SPC (the space bar): ")
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
93 (let ((cursor-in-echo-area t))
60460
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
94 (while (progn (setq char (read-event))
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
95 (or (not (numberp char))
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
96 (not (memq (downcase char)
74240
9f4b4800edc6 (disabled-command-function): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents: 72718
diff changeset
97 '(?! ?y ?n ?\s ?\C-g)))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
98 (ding)
44052
28bd7ea81b05 (disabled-command-hook): Clarify output text to match prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 43077
diff changeset
99 (message "Please type y, n, ! or SPC (the space bar): "))))
60460
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
100 (setq char (downcase char))
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
101 (if (= char ?\C-g)
7da5648c2f7d (disabled-command-function): Output in *Disabled Command*.
Richard M. Stallman <rms@gnu.org>
parents: 60100
diff changeset
102 (setq quit-flag t))
16649
8a01398a26e6 (disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents: 14169
diff changeset
103 (if (= char ?!)
56623
c8c558c4f4a7 (disabled-command-function): New variable renamed from
Luc Teirlinck <teirllm@auburn.edu>
parents: 56569
diff changeset
104 (setq disabled-command-function nil))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
105 (if (= char ?y)
7173
b6a358a4bdfb (disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents: 5927
diff changeset
106 (if (and user-init-file
b6a358a4bdfb (disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents: 5927
diff changeset
107 (not (string= "" user-init-file))
b6a358a4bdfb (disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents: 5927
diff changeset
108 (y-or-n-p "Enable command for future editing sessions also? "))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
109 (enable-command this-command)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
110 (put this-command 'disabled nil)))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
111 (if (/= char ?n)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
112 (call-interactively this-command))))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
113
256
7e4c7ef44243 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 36
diff changeset
114 ;;;###autoload
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
115 (defun enable-command (command)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
116 "Allow COMMAND to be executed without special confirmation from now on.
56569
a6cb62c42cec (enable-command, disable-command): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
117 COMMAND must be a symbol.
a6cb62c42cec (enable-command, disable-command): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
118 This command alters the user's .emacs file so that this will apply
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
119 to future sessions."
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
120 (interactive "CEnable command: ")
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
121 (put command 'disabled nil)
43059
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
122 (let ((init-file user-init-file)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
123 (default-init-file
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
124 (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
125 (when (null init-file)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
126 (if (or (file-exists-p default-init-file)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
127 (and (eq system-type 'windows-nt)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
128 (file-exists-p "~/_emacs")))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
129 ;; Started with -q, i.e. the file containing
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
130 ;; enabled/disabled commands hasn't been read. Saving
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
131 ;; settings there would overwrite other settings.
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
132 (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
133 (setq init-file default-init-file)
37899
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
134 (if (and (not (file-exists-p init-file))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
135 (eq system-type 'windows-nt)
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
136 (file-exists-p "~/_emacs"))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
137 (setq init-file "~/_emacs")))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
138 (save-excursion
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
139 (set-buffer (find-file-noselect
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
140 (substitute-in-file-name init-file)))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
141 (goto-char (point-min))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
142 (if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
143 (delete-region
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
144 (progn (beginning-of-line) (point))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
145 (progn (forward-line 1) (point))))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
146 ;; Explicitly enable, in case this command is disabled by default
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
147 ;; or in case the code we deleted was actually a comment.
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
148 (goto-char (point-max))
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
149 (insert "\n(put '" (symbol-name command) " 'disabled nil)\n")
3c9f67eea2f9 (enable-command): If user-init-file is nil or does not
Eli Zaretskii <eliz@gnu.org>
parents: 18383
diff changeset
150 (save-buffer))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
151
256
7e4c7ef44243 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 36
diff changeset
152 ;;;###autoload
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
153 (defun disable-command (command)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
154 "Require special confirmation to execute COMMAND from now on.
56569
a6cb62c42cec (enable-command, disable-command): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
155 COMMAND must be a symbol.
a6cb62c42cec (enable-command, disable-command): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
156 This command alters the user's .emacs file so that this will apply
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
157 to future sessions."
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
158 (interactive "CDisable command: ")
5742
84cdd74ddbb0 (disable-command): Reject invalid commands.
Richard M. Stallman <rms@gnu.org>
parents: 5451
diff changeset
159 (if (not (commandp command))
84cdd74ddbb0 (disable-command): Reject invalid commands.
Richard M. Stallman <rms@gnu.org>
parents: 5451
diff changeset
160 (error "Invalid command name `%s'" command))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
161 (put command 'disabled t)
43059
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
162 (let ((init-file user-init-file)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
163 (default-init-file
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
164 (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
165 (when (null init-file)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
166 (if (or (file-exists-p default-init-file)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
167 (and (eq system-type 'windows-nt)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
168 (file-exists-p "~/_emacs")))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
169 ;; Started with -q, i.e. the file containing
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
170 ;; enabled/disabled commands hasn't been read. Saving
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
171 ;; settings there would overwrite other settings.
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
172 (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
173 (setq init-file default-init-file)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
174 (if (and (not (file-exists-p init-file))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
175 (eq system-type 'windows-nt)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
176 (file-exists-p "~/_emacs"))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
177 (setq init-file "~/_emacs")))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
178 (save-excursion
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
179 (set-buffer (find-file-noselect
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
180 (substitute-in-file-name init-file)))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
181 (goto-char (point-min))
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
182 (if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
183 (delete-region
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
184 (progn (beginning-of-line) (point))
61885
305cf10830d5 (disable-command): Don't add spurious newlines to the init file.
Lute Kamstra <lute@gnu.org>
parents: 60460
diff changeset
185 (progn (forward-line 1) (point)))
305cf10830d5 (disable-command): Don't add spurious newlines to the init file.
Lute Kamstra <lute@gnu.org>
parents: 60460
diff changeset
186 (goto-char (point-max))
305cf10830d5 (disable-command): Don't add spurious newlines to the init file.
Lute Kamstra <lute@gnu.org>
parents: 60460
diff changeset
187 (insert ?\n))
305cf10830d5 (disable-command): Don't add spurious newlines to the init file.
Lute Kamstra <lute@gnu.org>
parents: 60460
diff changeset
188 (insert "(put '" (symbol-name command) " 'disabled t)\n")
43059
0a91a443d091 (enable-command): If Emacs was invoked as "emacs -q",
Eli Zaretskii <eliz@gnu.org>
parents: 38412
diff changeset
189 (save-buffer))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
190
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 16675
diff changeset
191 (provide 'novice)
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 16675
diff changeset
192
57096
1ab0f10dbd94 (disabled-command-hook): Use shorthand for obsolescence.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56623
diff changeset
193 ;; arch-tag: f83c0f96-497e-4db6-a430-8703716c6dd9
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 282
diff changeset
194 ;;; novice.el ends here