Mercurial > emacs
annotate lisp/echistory.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 | 9a83b898793c |
children | 253f761ad37b |
rev | line source |
---|---|
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
1 ;;; echistory.el --- Electric Command History Mode |
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
2 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
3 ;; Copyright (C) 1985 Free Software Foundation, Inc. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
4 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
5 ;; Author: K. Shane Hartman |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
6 ;; Maintainer: FSF |
198 | 7 |
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:
662
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
198 | 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. | |
198 | 24 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
25 ;;; Code: |
198 | 26 |
27 (require 'electric) ; command loop | |
28 (require 'chistory) ; history lister | |
29 | |
258 | 30 ;;;###autoload |
198 | 31 (defun Electric-command-history-redo-expression (&optional noconfirm) |
32 "Edit current history line in minibuffer and execute result. | |
33 With prefix arg NOCONFIRM, execute current line as-is without editing." | |
34 (interactive "P") | |
35 (let (todo) | |
36 (save-excursion | |
37 (set-buffer "*Command History*") | |
38 (beginning-of-line) | |
39 (setq todo (read (current-buffer))) | |
40 (if (boundp 'electric-history-in-progress) | |
41 (if todo (throw 'electric-history-quit (list noconfirm todo))))))) | |
42 | |
43 (defvar electric-history-map ()) | |
44 (if electric-history-map | |
45 () | |
3651
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
46 (setq electric-history-map (make-sparse-keymap)) |
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
47 (define-key electric-history-map [t] 'Electric-history-undefined) |
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
48 (define-key electric-history-map "\e" (make-sparse-keymap)) |
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
49 (define-key electric-history-map [?\e t] 'Electric-history-undefined) |
198 | 50 (define-key electric-history-map "\C-u" 'universal-argument) |
51 (define-key electric-history-map " " 'Electric-command-history-redo-expression) | |
52 (define-key electric-history-map "!" 'Electric-command-history-redo-expression) | |
53 (define-key electric-history-map "\e\C-x" 'eval-sexp) | |
54 (define-key electric-history-map "\e\C-d" 'down-list) | |
55 (define-key electric-history-map "\e\C-u" 'backward-up-list) | |
56 (define-key electric-history-map "\e\C-b" 'backward-sexp) | |
57 (define-key electric-history-map "\e\C-f" 'forward-sexp) | |
58 (define-key electric-history-map "\e\C-a" 'beginning-of-defun) | |
59 (define-key electric-history-map "\e\C-e" 'end-of-defun) | |
60 (define-key electric-history-map "\e\C-n" 'forward-list) | |
61 (define-key electric-history-map "\e\C-p" 'backward-list) | |
62 (define-key electric-history-map "q" 'Electric-history-quit) | |
63 (define-key electric-history-map "\C-c" nil) | |
64 (define-key electric-history-map "\C-c\C-c" 'Electric-history-quit) | |
65 (define-key electric-history-map "\C-]" 'Electric-history-quit) | |
66 (define-key electric-history-map "\C-z" 'suspend-emacs) | |
919 | 67 (define-key electric-history-map (char-to-string help-char) 'Helper-help) |
198 | 68 (define-key electric-history-map "?" 'Helper-describe-bindings) |
69 (define-key electric-history-map "\e>" 'end-of-buffer) | |
70 (define-key electric-history-map "\e<" 'beginning-of-buffer) | |
71 (define-key electric-history-map "\n" 'next-line) | |
72 (define-key electric-history-map "\r" 'next-line) | |
73 (define-key electric-history-map "\177" 'previous-line) | |
74 (define-key electric-history-map "\C-n" 'next-line) | |
75 (define-key electric-history-map "\C-p" 'previous-line) | |
76 (define-key electric-history-map "\ev" 'scroll-down) | |
77 (define-key electric-history-map "\C-v" 'scroll-up) | |
3651
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
78 (define-key electric-history-map [home] 'beginning-of-buffer) |
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
79 (define-key electric-history-map [down] 'next-line) |
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
80 (define-key electric-history-map [up] 'previous-line) |
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
81 (define-key electric-history-map [prior] 'scroll-down) |
c37784da62e7
(electric-history-map): Don't use fillarray;
Richard M. Stallman <rms@gnu.org>
parents:
919
diff
changeset
|
82 (define-key electric-history-map [next] 'scroll-up) |
198 | 83 (define-key electric-history-map "\C-l" 'recenter) |
84 (define-key electric-history-map "\e\C-v" 'scroll-other-window)) | |
85 | |
86 (defvar electric-command-history-hook nil | |
87 "If non-nil, its value is called by `electric-command-history'.") | |
88 | |
89 (defun electric-command-history () | |
90 "\\<electric-history-map>Major mode for examining and redoing commands from `command-history'. | |
91 This pops up a window with the Command History listing. | |
92 The number of command listed is controlled by `list-command-history-max'. | |
93 The command history is filtered by `list-command-history-filter' if non-nil. | |
94 Combines typeout Command History list window with menu like selection | |
95 of an expression from the history for re-evaluation in the *original* buffer. | |
96 | |
97 The history displayed is filtered by `list-command-history-filter' if non-nil. | |
98 | |
99 Like Emacs-Lisp mode except that characters do not insert themselves and | |
100 Tab and Linefeed do not indent. Instead these commands are provided: | |
101 \\{electric-history-map} | |
102 | |
103 Calls the value of `electric-command-history-hook' if that is non-nil. | |
104 The Command History listing is recomputed each time this mode is invoked." | |
105 (interactive) | |
106 (let ((electric-history-in-progress t) | |
107 (old-buffer (current-buffer)) | |
108 (todo)) | |
109 (unwind-protect | |
110 (setq todo | |
111 (catch 'electric-history-quit | |
112 (save-window-excursion | |
113 (save-window-excursion | |
114 (list-command-history) | |
115 (set-buffer "*Command History*") | |
27064
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
116 (Command-history-setup) |
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
117 (setq major-mode 'electric-command-history) |
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
118 (setq mode-name "Electric History") |
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
119 (use-local-map electric-history-map)) |
198 | 120 (Electric-pop-up-window "*Command History*") |
121 (run-hooks 'electric-command-history-hook) | |
122 (if (eobp) | |
123 (progn (ding) | |
124 (message "No command history.") | |
125 (throw 'electric-history-quit nil)) | |
126 (let ((Helper-return-blurb "return to History")) | |
127 (Electric-command-loop 'electric-history-quit | |
128 "->" t)))))) | |
129 (set-buffer "*Command History*") | |
27064
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
130 (command-history-mode) |
198 | 131 (bury-buffer (current-buffer))) |
132 (if (consp todo) | |
133 (progn (set-buffer old-buffer) | |
134 (if (car todo) | |
135 (apply (car (car (cdr todo))) (cdr (car (cdr todo)))) | |
136 (edit-and-eval-command "Redo: " (car (cdr todo)))))))) | |
137 | |
138 (defun Electric-history-undefined () | |
139 (interactive) | |
140 (ding) | |
7382
8b71746369ed
(Electric-history-undefined): Substitute `Helper-help', not `Help-for-help'.
Karl Heuer <kwzh@gnu.org>
parents:
3651
diff
changeset
|
141 (message (substitute-command-keys "Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute")) |
198 | 142 (sit-for 4)) |
143 | |
144 (defun Electric-history-quit () | |
145 "Quit Electric Command History, restoring previous window configuration." | |
146 (interactive) | |
147 (if (boundp 'electric-history-in-progress) | |
148 (progn (message "") | |
149 (throw 'electric-history-quit nil)))) | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
150 |
18383 | 151 (provide 'echistory) |
152 | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
153 ;;; echistory.el ends here |