aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-01-10 07:51:25 +0000
committerDan Nicolaescu2008-01-10 07:51:25 +0000
commitb6fe5b19b12215ed6ad04d57e8ea4c6b2331744e (patch)
tree0a047e54a3b8509ba275804282afa55c4e2c4435
parentacb93bb2a68eac61448a2da39e9f7f0b14d6869b (diff)
downloademacs-b6fe5b19b12215ed6ad04d57e8ea4c6b2331744e.tar.gz
emacs-b6fe5b19b12215ed6ad04d57e8ea4c6b2331744e.zip
* vc.el (vc-status-unmark-all-files): New function.
(vc-status-unmark-all-files): Likewise. (vc-status-mode-map): Add bindings.
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/vc.el22
2 files changed, 31 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0244aa5d4b..9afc7d600d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,15 @@
12008-01-10 Tom Tromey <tromey@redhat.com>
2
3 * vc.el (vc-status-unmark-all-files): New function.
4 (vc-status-unmark-all-files): Likewise.
5 (vc-status-mode-map): Add bindings.
6
12008-01-10 Michael Kifer <kifer@cs.stonybrook.edu> 72008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
2 8
3 * ediff*.el: uncommented declare-function. 9 * ediff*.el: uncommented declare-function.
4 10
5 * viper*.el: uncommented declare-function. 11 * viper*.el: uncommented declare-function.
6 12
72008-01-09 Tassilo Horn <tassilo@member.fsf.org> 132008-01-09 Tassilo Horn <tassilo@member.fsf.org>
8 14
9 * doc-view.el (doc-view-mode): Support tramp, compressed files and 15 * doc-view.el (doc-view-mode): Support tramp, compressed files and
diff --git a/lisp/vc.el b/lisp/vc.el
index 5966cfb7a7e..88915f3715f 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2552,8 +2552,10 @@ With prefix arg READ-SWITCHES, specify a value to override
2552 (suppress-keymap map) 2552 (suppress-keymap map)
2553 ;; Marking. 2553 ;; Marking.
2554 (define-key map "m" 'vc-status-mark-file) 2554 (define-key map "m" 'vc-status-mark-file)
2555 (define-key map "M" 'vc-status-mark-all-files)
2555 (define-key map "u" 'vc-status-unmark-file) 2556 (define-key map "u" 'vc-status-unmark-file)
2556 (define-key map "\C-?" 'vc-status-unmark-file-up) 2557 (define-key map "\C-?" 'vc-status-unmark-file-up)
2558 (define-key map "\M-\C-?" 'vc-status-unmark-all-files)
2557 ;; Movement. 2559 ;; Movement.
2558 (define-key map "n" 'vc-status-next-line) 2560 (define-key map "n" 'vc-status-next-line)
2559 (define-key map " " 'vc-status-next-line) 2561 (define-key map " " 'vc-status-next-line)
@@ -2627,6 +2629,16 @@ If a prefix argument is given, move by that many lines."
2627 (ewoc-invalidate vc-status crt) 2629 (ewoc-invalidate vc-status crt)
2628 (vc-status-next-line 1))) 2630 (vc-status-next-line 1)))
2629 2631
2632(defun vc-status-mark-all-files ()
2633 "Mark all files."
2634 (interactive)
2635 (ewoc-map
2636 (lambda (file)
2637 (unless (vc-status-fileinfo->marked file)
2638 (setf (vc-status-fileinfo->marked file) t)
2639 t))
2640 vc-status))
2641
2630(defun vc-status-unmark-file () 2642(defun vc-status-unmark-file ()
2631 "Unmark the current file and move to the next line." 2643 "Unmark the current file and move to the next line."
2632 (interactive) 2644 (interactive)
@@ -2648,6 +2660,16 @@ If a prefix argument is given, move by that many lines."
2648 (ewoc-invalidate vc-status prev) 2660 (ewoc-invalidate vc-status prev)
2649 (vc-status-move-to-goal-column))) 2661 (vc-status-move-to-goal-column)))
2650 2662
2663(defun vc-status-unmark-all-files ()
2664 "Unmark all files."
2665 (interactive)
2666 (ewoc-map
2667 (lambda (file)
2668 (when (vc-status-fileinfo->marked file)
2669 (setf (vc-status-fileinfo->marked file) nil)
2670 t))
2671 vc-status))
2672
2651(defun vc-status-register () 2673(defun vc-status-register ()
2652 "Register the marked files, or the current file if no marks." 2674 "Register the marked files, or the current file if no marks."
2653 (interactive) 2675 (interactive)