aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorSam Steingold2008-04-29 13:42:15 +0000
committerSam Steingold2008-04-29 13:42:15 +0000
commitac2c49f4e9d920cd2af67097924a19f9cf5c0787 (patch)
tree4886846e6f1e5cb19ff7600ca2d498f52efedc6a /lisp
parent56a03d92cff7beb547151d1637a4324320ff67b5 (diff)
downloademacs-ac2c49f4e9d920cd2af67097924a19f9cf5c0787.tar.gz
emacs-ac2c49f4e9d920cd2af67097924a19f9cf5c0787.zip
(vc-dir-mode-hook): Add normal hook.
(vc-dir-mode): Run it.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/vc.el11
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afbc3a578b4..7ca0a5205f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-04-29 Sam Steingold <sds@gnu.org>
2
3 * vc.el (vc-dir-mode-hook): Add normal hook.
4 (vc-dir-mode): Run it.
5
12008-04-29 Nick Roberts <nickrob@snap.net.nz> 62008-04-29 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * progmodes/gdb-ui.el (gdb-display-buffer): Don't pop up GUD buffer. 8 * progmodes/gdb-ui.el (gdb-display-buffer): Don't pop up GUD buffer.
@@ -6,7 +11,7 @@
6 (gdb-same-frame): Reverse initial value. 11 (gdb-same-frame): Reverse initial value.
7 (gdb-display-gdb-buffer): Check for GUD buffer in other frames. 12 (gdb-display-gdb-buffer): Check for GUD buffer in other frames.
8 13
9 * progmodes/gud.el (gud-speedbar-buttons): Raise frame in 14 * progmodes/gud.el (gud-speedbar-buttons): Raise frame in
10 gdb-speedbar-timer-fn. 15 gdb-speedbar-timer-fn.
11 16
122008-04-29 Stefan Monnier <monnier@iro.umontreal.ca> 172008-04-29 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/vc.el b/lisp/vc.el
index 451da02435d..81762b69093 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -832,6 +832,12 @@ version control backend imposes itself."
832 :type 'hook 832 :type 'hook
833 :group 'vc) 833 :group 'vc)
834 834
835(defcustom vc-dir-mode-hook nil
836 "Normal hook run by `vc-dir-mode'.
837See `run-hooks'."
838 :type 'hook
839 :group 'vc)
840
835;; Annotate customization 841;; Annotate customization
836(defcustom vc-annotate-color-map 842(defcustom vc-annotate-color-map
837 (if (and (tty-display-color-p) (<= (display-color-cells) 8)) 843 (if (and (tty-display-color-p) (<= (display-color-cells) 8))
@@ -1592,7 +1598,7 @@ merge in the changes into your working copy."
1592 (setq model (vc-checkout-model (car files))) 1598 (setq model (vc-checkout-model (car files)))
1593 (setq state (vc-state file)) 1599 (setq state (vc-state file))
1594 (return))) 1600 (return)))
1595 1601
1596 ;; Verify that the fileset is homogeneous 1602 ;; Verify that the fileset is homogeneous
1597 (dolist (file (cdr files)) 1603 (dolist (file (cdr files))
1598 ;; Ignore directories, they are compatible with anything. 1604 ;; Ignore directories, they are compatible with anything.
@@ -3046,7 +3052,8 @@ specific headers."
3046 ;; Make sure that if the VC status buffer is killed, the update 3052 ;; Make sure that if the VC status buffer is killed, the update
3047 ;; process running in the background is also killed. 3053 ;; process running in the background is also killed.
3048 (add-hook 'kill-buffer-query-functions 'vc-dir-kill-query nil t) 3054 (add-hook 'kill-buffer-query-functions 'vc-dir-kill-query nil t)
3049 (vc-dir-refresh))) 3055 (vc-dir-refresh))
3056 (run-hooks 'vc-dir-mode-hook))
3050 3057
3051(put 'vc-dir-mode 'mode-class 'special) 3058(put 'vc-dir-mode 'mode-class 'special)
3052 3059