Mercurial > emacs
annotate lisp/novice.el @ 12279:de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
'none-value of vc-locking-user, and the consistent caching
of all properties. Especially, make the properties survive
check-ins and check-outs. Various minor bug fixes.
(vc-file-clear-masterprops): New function.
(vc-backend-checkin, vc-backend-revert): Set vc-locking-user
to 'none if the file is unlocked.
(vc-backend-checkin, vc-backend-revert, vc-backend-checkout):
Use vc-file-clear-masterprops, and adjust those properties
that are not cleared.
(vc-resynch-window): Temporarily remove vc-find-file-hook, so
that we don't lose the file properties during check-in/out.
(vc-resynch-window): Do not try to delete the current window if
`vc-keep-workfiles' is nil (doesn't make sense; killing the
buffer is enough.)
(vc-backend-checkin): Rewrote the code that adjusts the default
branch and removes any locks that might remain after check-in.
(vc-cancel-version): Abort with error message in the CVS case.
(The error used to be signalled in vc-backend-uncheck, which is
a little too late.)
(vc-minor-revision): Function removed.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 16 Jun 1995 18:02:51 +0000 |
parents | 1a97dea087d1 |
children | 83f275dcd93a |
rev | line source |
---|---|
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
282
diff
changeset
|
1 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs. |
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
282
diff
changeset
|
2 |
7300 | 3 ;; Copyright (C) 1985, 1986, 1987, 1994 Free Software Foundation, Inc. |
845 | 4 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
5 ;; Maintainer: FSF |
814
38b2499cb3e9
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
6 ;; Keywords: internal, help |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
7 |
36 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
36 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
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 | 31 |
32 ;; This function is called (by autoloading) | |
33 ;; to handle any disabled command. | |
34 ;; The command is found in this-command | |
35 ;; and the keys are returned by (this-command-keys). | |
36 | |
256 | 37 ;;;###autoload |
268 | 38 (setq disabled-command-hook 'disabled-command-hook) |
39 | |
282 | 40 ;;;###autoload |
36 | 41 (defun disabled-command-hook (&rest ignore) |
42 (let (char) | |
43 (save-window-excursion | |
44 (with-output-to-temp-buffer "*Help*" | |
10695
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
45 (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
|
46 (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
|
47 (if (stringp keys) |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
48 (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
|
49 ?\M-x)) |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
50 (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
|
51 (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
|
52 (eq (aref keys 1) ?x))) |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
53 (princ "You have invoked the disabled command ") |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
54 (princ "You have typed ") |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
55 (princ (key-description keys)) |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
56 (princ ", invoking disabled command "))) |
36 | 57 (princ this-command) |
58 (princ ":\n") | |
59 ;; Print any special message saying why the command is disabled. | |
60 (if (stringp (get this-command 'disabled)) | |
61 (princ (get this-command 'disabled))) | |
62 (princ (or (condition-case () | |
63 (documentation this-command) | |
64 (error nil)) | |
65 "<< not documented >>")) | |
66 ;; Keep only the first paragraph of the documentation. | |
67 (save-excursion | |
68 (set-buffer "*Help*") | |
69 (goto-char (point-min)) | |
70 (if (search-forward "\n\n" nil t) | |
71 (delete-region (1- (point)) (point-max)) | |
72 (goto-char (point-max)))) | |
73 (princ "\n\n") | |
74 (princ "You can now type | |
75 Space to try the command just this once, | |
76 but leave it disabled, | |
77 Y to try it and enable it (no questions if you use it again), | |
9849
430b8cf09515
(disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
78 N to do nothing (command remains disabled).") |
430b8cf09515
(disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
79 (save-excursion |
430b8cf09515
(disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
80 (set-buffer standard-output) |
430b8cf09515
(disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
81 (help-mode))) |
36 | 82 (message "Type y, n or Space: ") |
83 (let ((cursor-in-echo-area t)) | |
84 (while (not (memq (setq char (downcase (read-char))) | |
85 '(? ?y ?n))) | |
86 (ding) | |
87 (message "Please type y, n or Space: ")))) | |
88 (if (= char ?y) | |
7173
b6a358a4bdfb
(disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents:
5927
diff
changeset
|
89 (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
|
90 (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
|
91 (y-or-n-p "Enable command for future editing sessions also? ")) |
36 | 92 (enable-command this-command) |
93 (put this-command 'disabled nil))) | |
94 (if (/= char ?n) | |
95 (call-interactively this-command)))) | |
96 | |
256 | 97 ;;;###autoload |
36 | 98 (defun enable-command (command) |
99 "Allow COMMAND to be executed without special confirmation from now on. | |
100 The user's .emacs file is altered so that this will apply | |
101 to future sessions." | |
102 (interactive "CEnable command: ") | |
103 (put command 'disabled nil) | |
104 (save-excursion | |
7173
b6a358a4bdfb
(disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents:
5927
diff
changeset
|
105 (set-buffer (find-file-noselect |
5451
165b0bf0e879
(enable-command, disable-command): Use user-init-file.
Richard M. Stallman <rms@gnu.org>
parents:
2441
diff
changeset
|
106 (substitute-in-file-name user-init-file))) |
36 | 107 (goto-char (point-min)) |
108 (if (search-forward (concat "(put '" (symbol-name command) " ") nil t) | |
109 (delete-region | |
110 (progn (beginning-of-line) (point)) | |
10216
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
111 (progn (forward-line 1) (point)))) |
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
112 ;; Explicitly enable, in case this command is disabled by default |
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
113 ;; or in case the code we deleted was actually a comment. |
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
114 (goto-char (point-max)) |
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
115 (insert "\n(put '" (symbol-name command) " 'disabled nil)\n") |
36 | 116 (save-buffer))) |
117 | |
256 | 118 ;;;###autoload |
36 | 119 (defun disable-command (command) |
120 "Require special confirmation to execute COMMAND from now on. | |
121 The user's .emacs file is altered so that this will apply | |
122 to future sessions." | |
123 (interactive "CDisable command: ") | |
5742
84cdd74ddbb0
(disable-command): Reject invalid commands.
Richard M. Stallman <rms@gnu.org>
parents:
5451
diff
changeset
|
124 (if (not (commandp command)) |
84cdd74ddbb0
(disable-command): Reject invalid commands.
Richard M. Stallman <rms@gnu.org>
parents:
5451
diff
changeset
|
125 (error "Invalid command name `%s'" command)) |
36 | 126 (put command 'disabled t) |
127 (save-excursion | |
7173
b6a358a4bdfb
(disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents:
5927
diff
changeset
|
128 (set-buffer (find-file-noselect |
5451
165b0bf0e879
(enable-command, disable-command): Use user-init-file.
Richard M. Stallman <rms@gnu.org>
parents:
2441
diff
changeset
|
129 (substitute-in-file-name user-init-file))) |
36 | 130 (goto-char (point-min)) |
131 (if (search-forward (concat "(put '" (symbol-name command) " ") nil t) | |
132 (delete-region | |
133 (progn (beginning-of-line) (point)) | |
134 (progn (forward-line 1) (point)))) | |
135 (goto-char (point-max)) | |
10216
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
136 (insert "\n(put '" (symbol-name command) " 'disabled t)\n") |
36 | 137 (save-buffer))) |
138 | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
282
diff
changeset
|
139 ;;; novice.el ends here |