Mercurial > emacs
annotate lisp/novice.el @ 31383:860d7ac182e3
(vc-rcs-show-log-entry): New function.
(vc-rcs-checkin, vc-rcs-checkout): Don't set all properties.
(vc-rcs-register): If there is no RCS subdir, ask the
user whether to create one.
(vc-rcs-state-heuristic): Use
file-ownership-preserved-p.
(vc-rcs-checkout): Remove the error-handling for missing-rcs.
(vc-rcs-state-heuristic): Don't use file-writable-p.
(vc-rcs-print-log): Insert in the current buffer.
(vc-rcs-diff): Insert in the current buffer and remove unused arg
CMP.
(vc-rcs-workfile-unchanged-p): Use vc-do-command
instead of vc-simple-command.
(vc-rcs-fetch-master-state): Removed check for unlocked-changes to
avoid doing a diff when opening a file.
(vc-rcs-state): Added check for unlocked-changes.
(vc-rcs-header): Escape Id.
(vc-rcs-workfile-unchanged-p): Remove optional arg VERSION.
(vc-rcs-state): Call vc-workfile-unchanged-p, not the RCS-specific
version.
(vc-rcs-state-heuristic): Use file-writable-p instead
of comparing userids.
(vc-rcs-fetch-master-state): Handle the case where rcs is missing.
Simplify the logic by eliminating unreachable code.
(vc-rcs-diff): Only pass `2' to vc-do-command if necessary and
just do a recursive call if we need to retry.
(vc-rcs-checkout): Handle the case where rcs is missing by making
the buffer read-write if requested and re-signalling the error.
(vc-rcs-find-most-recent-rev): New function. The code
derives from the old vc-parse-buffer but uses the revision number
rather than the date (much easier to compare robustly).
(vc-rcs-fetch-master-state): Use `with-temp-buffer'. Adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev). Find the
locking-user more directly. Check strict locking and set
checkout-model appropriately.
(vc-rcs-parse-locks): Remove.
(vc-rcs-latest-on-branch-p): Use with-temp-buffer and adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev).
(vc-rcs-system-release): Use with-current-buffer and
vc-parse-buffer.
(vc-rcs-register, vc-rcs-checkout): Use with-current-buffer.
Merge in code
from vc-rcs-hooks.el. Don't require 'vc anymore.
(vc-rcs-responsible-p): Use expand-file-name instead of concat and
file-directory-p instead of file-exists-p.
(vc-rcs-exists): Remove.
(vc-rcs-header): New var.
Update Copyright.
(vc-rcs-rename-file): New function.
(vc-rcs-diff): Remove unused `backend' variable.
(vc-rcs-clear-headers): New function; code moved here
from vc-clear-headers in vc.el.
(tail): Provide vc-rcs and remove vc-rcs-logentry-check.
(vc-rcs-register): Parse command output to find master
file name and workfile version.
(vc-rcs-checkout): Removed call to vc-file-clear-masterprops.
Require vc and vc-rcs-hooks.
(vc-rcs-trunk-p, vc-rcs-branch-part): Move to vc-rcs-hooks.
(vc-rcs-backend-release-p): Remove (use vc-rcs-release-p).
(vc-release-greater-or-equal-p): Move from vc.
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part,
vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates.
(vc-rcs-checkout): Add a missing `new-version' argument in the
call to vc-rcs-latest-on-branch-p. Hopefully that was the right
one.
(vc-rcs-steal-lock): Renamed from `vc-rcs-steal'.
Updated everything to use `vc-checkout-model'.
(vc-rcs-backend-release-p): function added. other
stuff updated to reference this function instead of the old
`vc-backend-release-p'.
(vc-rcs-logentry-check): Function added.
(vc-rcs-checkin, vc-rcs-previous-version)
(vc-rcs-checkout): Name space cleaned up. No more revision number
crunching function names that are not prefixed with vc-rcs.
(vc-rcs-checkout-model): Function added. References to
`vc-checkout-model' replaced.
(vc-rcs-admin): Added the query-only option as
required by the vc.el file.
(vc-rcs-exists): Function added.
(vc-*-checkout):
Use with-temp-file instead of /bin/sh. Merged from mainline
(vc-rcs-latest-on-branch-p): Moved to vc-rcs-hooks.el.
(vc-rcs-latest-on-branch-p, vc-rcs-trunk-p)
(vc-rcs-branch-p, vc-rcs-branch-part, vc-rcs-minor-part)
(vc-rcs-previous-version): Functions added.
(vc-rcs-diff): Function added.
(vc-rcs-checkout) Bug (typo) found and fixed.
(vc-rcs-register-switches) Variable `vc-rcs-register-switches' added.
Require vc when compiling.
(vc-rcs-print-log, vc-rcs-assign-name, vc-rcs-merge)
(vc-rcs-check-headers, vc-rcs-steal, vc-rcs-uncheck, vc-rcs-revert)
(vc-rcs-checkin): New functions (code from vc.el).
(vc-rcs-previous-version, vc-rcs-system-release, vc-rcs-checkout):
Doc fix.
(vc-rcs-release): Deleted. (Duplicated vc-rcs-system-release).
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part)
(vc-rcs-minor-part, vc-rcs-previous-version, vc-rcs-release)
(vc-rcs-release-p, vc-rcs-admin, vc-rcs-checkout): New functions
from vc.el.
(vc-rcs-system-release):
Renamed from vc-rcs-backend-release.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 04 Sep 2000 19:47:43 +0000 |
parents | 11218164bc54 |
children | 3c9f67eea2f9 |
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 | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
36 | 24 |
2308
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
25 ;;; Commentary: |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
26 |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
27 ;; 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
|
28 ;; 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
|
29 ;; 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
|
30 |
2232
4f9d60f7de9d
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
31 ;;; Code: |
36 | 32 |
33 ;; This function is called (by autoloading) | |
34 ;; to handle any disabled command. | |
35 ;; The command is found in this-command | |
36 ;; and the keys are returned by (this-command-keys). | |
37 | |
256 | 38 ;;;###autoload |
16649
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
39 (defvar disabled-command-hook 'disabled-command-hook |
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
40 "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
|
41 If nil, the feature is disabled, i.e., all commands work normally.") |
268 | 42 |
282 | 43 ;;;###autoload |
36 | 44 (defun disabled-command-hook (&rest ignore) |
45 (let (char) | |
46 (save-window-excursion | |
47 (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
|
48 (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
|
49 (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
|
50 (if (stringp keys) |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
51 (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
|
52 ?\M-x)) |
1a97dea087d1
(disabled-command-hook): Recognize ESC x as well as M-x.
Karl Heuer <kwzh@gnu.org>
parents:
10216
diff
changeset
|
53 (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
|
54 (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
|
55 (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
|
56 (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
|
57 (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
|
58 (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
|
59 (princ ", invoking disabled command "))) |
36 | 60 (princ this-command) |
61 (princ ":\n") | |
62 ;; Print any special message saying why the command is disabled. | |
63 (if (stringp (get this-command 'disabled)) | |
64 (princ (get this-command 'disabled))) | |
65 ;; Keep only the first paragraph of the documentation. | |
66 (save-excursion | |
67 (set-buffer "*Help*") | |
16675
6f45dc8d9d56
(disabled-command-hook): Correctly keep the first
Richard M. Stallman <rms@gnu.org>
parents:
16649
diff
changeset
|
68 (goto-char (point-max)) |
6f45dc8d9d56
(disabled-command-hook): Correctly keep the first
Richard M. Stallman <rms@gnu.org>
parents:
16649
diff
changeset
|
69 (save-excursion |
6f45dc8d9d56
(disabled-command-hook): Correctly keep the first
Richard M. Stallman <rms@gnu.org>
parents:
16649
diff
changeset
|
70 (princ (or (condition-case () |
6f45dc8d9d56
(disabled-command-hook): Correctly keep the first
Richard M. Stallman <rms@gnu.org>
parents:
16649
diff
changeset
|
71 (documentation this-command) |
6f45dc8d9d56
(disabled-command-hook): Correctly keep the first
Richard M. Stallman <rms@gnu.org>
parents:
16649
diff
changeset
|
72 (error nil)) |
6f45dc8d9d56
(disabled-command-hook): Correctly keep the first
Richard M. Stallman <rms@gnu.org>
parents:
16649
diff
changeset
|
73 "<< not documented >>"))) |
36 | 74 (if (search-forward "\n\n" nil t) |
75 (delete-region (1- (point)) (point-max)) | |
76 (goto-char (point-max)))) | |
77 (princ "\n\n") | |
78 (princ "You can now type | |
16649
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
79 Space to try the command just this once, but leave it disabled, |
36 | 80 Y to try it and enable it (no questions if you use it again), |
16649
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
81 ! to try it and enable all commands in this session, or |
9849
430b8cf09515
(disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
82 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
|
83 (save-excursion |
430b8cf09515
(disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
84 (set-buffer standard-output) |
430b8cf09515
(disabled-command-hook): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
7300
diff
changeset
|
85 (help-mode))) |
16649
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
86 (message "Type y, n, ! or Space: ") |
36 | 87 (let ((cursor-in-echo-area t)) |
88 (while (not (memq (setq char (downcase (read-char))) | |
16649
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
89 '(?! ? ?y ?n))) |
36 | 90 (ding) |
16649
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
91 (message "Please type y, n, ! or Space: ")))) |
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
92 (if (= char ?!) |
8a01398a26e6
(disabled-command-hook): Use `defvar' and add documentation string.
Erik Naggum <erik@naggum.no>
parents:
14169
diff
changeset
|
93 (setq disabled-command-hook nil)) |
36 | 94 (if (= char ?y) |
7173
b6a358a4bdfb
(disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents:
5927
diff
changeset
|
95 (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
|
96 (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
|
97 (y-or-n-p "Enable command for future editing sessions also? ")) |
36 | 98 (enable-command this-command) |
99 (put this-command 'disabled nil))) | |
100 (if (/= char ?n) | |
101 (call-interactively this-command)))) | |
102 | |
256 | 103 ;;;###autoload |
36 | 104 (defun enable-command (command) |
105 "Allow COMMAND to be executed without special confirmation from now on. | |
106 The user's .emacs file is altered so that this will apply | |
107 to future sessions." | |
108 (interactive "CEnable command: ") | |
109 (put command 'disabled nil) | |
110 (save-excursion | |
7173
b6a358a4bdfb
(disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents:
5927
diff
changeset
|
111 (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
|
112 (substitute-in-file-name user-init-file))) |
36 | 113 (goto-char (point-min)) |
114 (if (search-forward (concat "(put '" (symbol-name command) " ") nil t) | |
115 (delete-region | |
116 (progn (beginning-of-line) (point)) | |
10216
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
117 (progn (forward-line 1) (point)))) |
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
118 ;; 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
|
119 ;; 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
|
120 (goto-char (point-max)) |
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
121 (insert "\n(put '" (symbol-name command) " 'disabled nil)\n") |
36 | 122 (save-buffer))) |
123 | |
256 | 124 ;;;###autoload |
36 | 125 (defun disable-command (command) |
126 "Require special confirmation to execute COMMAND from now on. | |
127 The user's .emacs file is altered so that this will apply | |
128 to future sessions." | |
129 (interactive "CDisable command: ") | |
5742
84cdd74ddbb0
(disable-command): Reject invalid commands.
Richard M. Stallman <rms@gnu.org>
parents:
5451
diff
changeset
|
130 (if (not (commandp command)) |
84cdd74ddbb0
(disable-command): Reject invalid commands.
Richard M. Stallman <rms@gnu.org>
parents:
5451
diff
changeset
|
131 (error "Invalid command name `%s'" command)) |
36 | 132 (put command 'disabled t) |
133 (save-excursion | |
7173
b6a358a4bdfb
(disabled-command-hook): Try to enable command in user
Richard M. Stallman <rms@gnu.org>
parents:
5927
diff
changeset
|
134 (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
|
135 (substitute-in-file-name user-init-file))) |
36 | 136 (goto-char (point-min)) |
137 (if (search-forward (concat "(put '" (symbol-name command) " ") nil t) | |
138 (delete-region | |
139 (progn (beginning-of-line) (point)) | |
140 (progn (forward-line 1) (point)))) | |
141 (goto-char (point-max)) | |
10216
c1ad03de412e
(enable-command): Always insert code to enable.
Richard M. Stallman <rms@gnu.org>
parents:
9849
diff
changeset
|
142 (insert "\n(put '" (symbol-name command) " 'disabled t)\n") |
36 | 143 (save-buffer))) |
144 | |
18383 | 145 (provide 'novice) |
146 | |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
282
diff
changeset
|
147 ;;; novice.el ends here |