diff options
| author | Dan Nicolaescu | 2007-07-28 02:01:43 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-07-28 02:01:43 +0000 |
| commit | a0709d8dc9d60d2fb2ec71457085f6f8d1079614 (patch) | |
| tree | 8480ded8a1c0e0cd31a63b793ffbc3cd02a8a04e | |
| parent | 2c5b4e795457f83d3a8ae78f13c042bb8370d67e (diff) | |
| download | emacs-a0709d8dc9d60d2fb2ec71457085f6f8d1079614.tar.gz emacs-a0709d8dc9d60d2fb2ec71457085f6f8d1079614.zip | |
(vc-git-print-log): Support both the old single file
interface and the new one.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-git.el | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc48a350dec..8d67655c579 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-07-28 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-git.el (vc-git-print-log): Support both the old single file | ||
| 4 | interface and the new one. | ||
| 5 | |||
| 1 | 2007-07-28 Nick Roberts <nickrob@snap.net.nz> | 6 | 2007-07-28 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 7 | ||
| 3 | * bindings.el (mode-line-remote): Use updated %@ construct. | 8 | * bindings.el (mode-line-remote): Use updated %@ construct. |
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 7e358ed0238..e4a9d26105a 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -260,7 +260,10 @@ | |||
| 260 | 260 | ||
| 261 | (defun vc-git-print-log (files &optional buffer) | 261 | (defun vc-git-print-log (files &optional buffer) |
| 262 | "Get change log associated with FILES." | 262 | "Get change log associated with FILES." |
| 263 | (let ((coding-system-for-read git-commits-coding-system)) | 263 | (let ((coding-system-for-read git-commits-coding-system) |
| 264 | ;; Support both the old print-log interface that passes a | ||
| 265 | ;; single file, and the new one that passes a file list. | ||
| 266 | (flist (if (listp files) files (list files)))) | ||
| 264 | ;; `vc-do-command' creates the buffer, but we need it before running | 267 | ;; `vc-do-command' creates the buffer, but we need it before running |
| 265 | ;; the command. | 268 | ;; the command. |
| 266 | (vc-setup-buffer buffer) | 269 | (vc-setup-buffer buffer) |
| @@ -273,7 +276,7 @@ | |||
| 273 | ;; "git rev-list" on each file separately to make sure that each | 276 | ;; "git rev-list" on each file separately to make sure that each |
| 274 | ;; file gets a "File:" header before the corresponding | 277 | ;; file gets a "File:" header before the corresponding |
| 275 | ;; log. Maybe there is a way to do this with one command... | 278 | ;; log. Maybe there is a way to do this with one command... |
| 276 | (dolist (file files) | 279 | (dolist (file flist) |
| 277 | (with-current-buffer | 280 | (with-current-buffer |
| 278 | buffer | 281 | buffer |
| 279 | (insert "File: " (file-name-nondirectory file) "\n")) | 282 | (insert "File: " (file-name-nondirectory file) "\n")) |