diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc.el | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3cedeca41d5..e22f4cb2ba7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 2008-04-30 Sam Steingold <sds@gnu.org> | 1 | 2008-04-30 Sam Steingold <sds@gnu.org> |
| 2 | 2 | ||
| 3 | * vc.el (vc-dir-mode-map): Bind "d" to vc-dir-delete-file. | 3 | * vc.el (vc-dir-delete-file): Add. |
| 4 | (vc-dir-delete-file): Add. | 4 | (vc-dir-mode-map): Bind "r" to vc-dir-delete-file, like in PCL-CVS. |
| 5 | (vc-delete-file): Do not barf when the file has been already deleted. | 5 | (vc-delete-file): Do not barf when the file has been already deleted. |
| 6 | 6 | ||
| 7 | 2008-04-30 Dan Nicolaescu <dann@ics.uci.edu> | 7 | 2008-04-30 Dan Nicolaescu <dann@ics.uci.edu> |
diff --git a/lisp/vc.el b/lisp/vc.el index 764e52f7066..d6536e8a3ee 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -2985,7 +2985,7 @@ specific headers." | |||
| 2985 | (define-key map "x" 'vc-dir-hide-up-to-date) | 2985 | (define-key map "x" 'vc-dir-hide-up-to-date) |
| 2986 | (define-key map "q" 'quit-window) | 2986 | (define-key map "q" 'quit-window) |
| 2987 | (define-key map "g" 'vc-dir-refresh) | 2987 | (define-key map "g" 'vc-dir-refresh) |
| 2988 | (define-key map "d" 'vc-dir-delete-file) | 2988 | (define-key map "r" 'vc-dir-delete-file) ; like in PCL-CVS |
| 2989 | (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process) | 2989 | (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process) |
| 2990 | ;; Does not work unless mouse sets point. Functions like vc-dir-find-file | 2990 | ;; Does not work unless mouse sets point. Functions like vc-dir-find-file |
| 2991 | ;; need to find the file from the mouse position, not `point'. | 2991 | ;; need to find the file from the mouse position, not `point'. |
| @@ -3054,12 +3054,12 @@ specific headers." | |||
| 3054 | (defun vc-dir-mode () | 3054 | (defun vc-dir-mode () |
| 3055 | "Major mode for showing the VC status for a directory. | 3055 | "Major mode for showing the VC status for a directory. |
| 3056 | Marking/Unmarking key bindings and actions: | 3056 | Marking/Unmarking key bindings and actions: |
| 3057 | m - marks a file/directory or ff the region is active, mark all the files | 3057 | m - marks a file/directory or ff the region is active, mark all the files |
| 3058 | in region. | 3058 | in region. |
| 3059 | Restrictions: - a file cannot be marked if any parent directory is marked | 3059 | Restrictions: - a file cannot be marked if any parent directory is marked |
| 3060 | - a directory cannot be marked if any child file or | 3060 | - a directory cannot be marked if any child file or |
| 3061 | directory is marked | 3061 | directory is marked |
| 3062 | u - marks a file/directory or if the region is active, unmark all the files | 3062 | u - marks a file/directory or if the region is active, unmark all the files |
| 3063 | in region. | 3063 | in region. |
| 3064 | M - if the cursor is on a file: mark all the files with the same VC state as | 3064 | M - if the cursor is on a file: mark all the files with the same VC state as |
| 3065 | the current file | 3065 | the current file |