diff options
| author | Dan Nicolaescu | 2009-02-11 06:36:32 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-02-11 06:36:32 +0000 |
| commit | c7f9e440607c982984fb387bd958413a924b613e (patch) | |
| tree | b2e8bbaa8fd818f85dbee5b0369970702e59aa05 | |
| parent | c87362126bb46c3c188c445b1b08b8c508c817c1 (diff) | |
| download | emacs-c7f9e440607c982984fb387bd958413a924b613e.tar.gz emacs-c7f9e440607c982984fb387bd958413a924b613e.zip | |
* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
(vc-default-dir-printer): Add a comment about updating this function.
* vc-git.el (vc-git-dir-printer): Use vc-dir-filename-mouse-map
for the file name.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/vc-dir.el | 7 | ||||
| -rw-r--r-- | lisp/vc-git.el | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4149355552f..30623650b3c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2009-02-10 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map. | ||
| 4 | (vc-default-dir-printer): Add a comment about updating this function. | ||
| 5 | |||
| 6 | * vc-git.el (vc-git-dir-printer): Use vc-dir-filename-mouse-map | ||
| 7 | for the file name. | ||
| 8 | |||
| 1 | 2009-02-11 Glenn Morris <rgm@gnu.org> | 9 | 2009-02-11 Glenn Morris <rgm@gnu.org> |
| 2 | 10 | ||
| 3 | * calendar/calendar.el (calendar-window-list): Ignore invisible windows. | 11 | * calendar/calendar.el (calendar-window-list): Ignore invisible windows. |
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el index 81be5f10cd1..93e081c0f9b 100644 --- a/lisp/vc-dir.el +++ b/lisp/vc-dir.el | |||
| @@ -1146,7 +1146,7 @@ Interactively, a prefix argument means to ask for the backend." | |||
| 1146 | (propertize "Please add backend specific headers here. It's easy!" | 1146 | (propertize "Please add backend specific headers here. It's easy!" |
| 1147 | 'face 'font-lock-warning-face))) | 1147 | 'face 'font-lock-warning-face))) |
| 1148 | 1148 | ||
| 1149 | (defvar vc-dir-mouse-map | 1149 | (defvar vc-dir-filename-mouse-map |
| 1150 | (let ((map (make-sparse-keymap))) | 1150 | (let ((map (make-sparse-keymap))) |
| 1151 | (define-key map [mouse-2] 'vc-dir-find-file-other-window) | 1151 | (define-key map [mouse-2] 'vc-dir-find-file-other-window) |
| 1152 | map) | 1152 | map) |
| @@ -1155,6 +1155,9 @@ Interactively, a prefix argument means to ask for the backend." | |||
| 1155 | (defun vc-default-dir-printer (backend fileentry) | 1155 | (defun vc-default-dir-printer (backend fileentry) |
| 1156 | "Pretty print FILEENTRY." | 1156 | "Pretty print FILEENTRY." |
| 1157 | ;; If you change the layout here, change vc-dir-move-to-goal-column. | 1157 | ;; If you change the layout here, change vc-dir-move-to-goal-column. |
| 1158 | ;; VC backends can implement backend specific versions of this | ||
| 1159 | ;; function. Changes here might need to be reflected in the | ||
| 1160 | ;; vc-BACKEND-dir-printer functions. | ||
| 1158 | (let* ((isdir (vc-dir-fileinfo->directory fileentry)) | 1161 | (let* ((isdir (vc-dir-fileinfo->directory fileentry)) |
| 1159 | (state (if isdir "" (vc-dir-fileinfo->state fileentry))) | 1162 | (state (if isdir "" (vc-dir-fileinfo->state fileentry))) |
| 1160 | (filename (vc-dir-fileinfo->name fileentry))) | 1163 | (filename (vc-dir-fileinfo->name fileentry))) |
| @@ -1179,7 +1182,7 @@ Interactively, a prefix argument means to ask for the backend." | |||
| 1179 | "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" | 1182 | "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" |
| 1180 | "File\nmouse-3: Pop-up menu") | 1183 | "File\nmouse-3: Pop-up menu") |
| 1181 | 'mouse-face 'highlight | 1184 | 'mouse-face 'highlight |
| 1182 | 'keymap vc-dir-mouse-map)))) | 1185 | 'keymap vc-dir-filename-mouse-map)))) |
| 1183 | 1186 | ||
| 1184 | (defun vc-default-extra-status-menu (backend) | 1187 | (defun vc-default-extra-status-menu (backend) |
| 1185 | nil) | 1188 | nil) |
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index b195124dee2..64d598c271a 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -302,6 +302,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 302 | (if isdir | 302 | (if isdir |
| 303 | "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" | 303 | "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" |
| 304 | "File\nmouse-3: Pop-up menu") | 304 | "File\nmouse-3: Pop-up menu") |
| 305 | 'keymap vc-dir-filename-mouse-map | ||
| 305 | 'mouse-face 'highlight) | 306 | 'mouse-face 'highlight) |
| 306 | (vc-git-file-type-as-string old-perm new-perm) | 307 | (vc-git-file-type-as-string old-perm new-perm) |
| 307 | (vc-git-rename-as-string state extra)))) | 308 | (vc-git-rename-as-string state extra)))) |