diff options
| author | Dan Nicolaescu | 2008-05-09 07:03:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-05-09 07:03:15 +0000 |
| commit | 927a444ee81ce5b433ba01a2a559187d52c11c42 (patch) | |
| tree | 68329da7b698e4af76373a2b5746dc749d7736ac | |
| parent | eef0be9e86cacb46249ef529f0f9c851b8fc985c (diff) | |
| download | emacs-927a444ee81ce5b433ba01a2a559187d52c11c42.tar.gz emacs-927a444ee81ce5b433ba01a2a559187d52c11c42.zip | |
(vc-version-diff, vc-print-log, vc-revert, vc-rollback)
(vc-update): Remove unused let bindings.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/vc.el | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ea50655461..65b7bc0e3e3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,8 +1,13 @@ | |||
| 1 | 2008-05-09 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc.el (vc-version-diff, vc-print-log, vc-revert, vc-rollback) | ||
| 4 | (vc-update): Remove unused let bindings. | ||
| 5 | |||
| 1 | 2008-05-09 Eric S. Raymond <esr@snark.thyrsus.com> | 6 | 2008-05-09 Eric S. Raymond <esr@snark.thyrsus.com> |
| 2 | 7 | ||
| 3 | * vc.el (vc-deduce-fileset, vc-next-action, vc-version-diff) | 8 | * vc.el (vc-deduce-fileset, vc-next-action, vc-version-diff) |
| 4 | (vc-diff, vc-rwevert, vc-rollback, vc-update), | 9 | (vc-diff, vc-revert, vc-rollback, vc-update): |
| 5 | vc-dispatcher.el (vc-dispatcher-selection-set): | 10 | * vc-dispatcher.el (vc-dispatcher-selection-set): |
| 6 | Get rid of 4 special cases in fileset selection. This involved | 11 | Get rid of 4 special cases in fileset selection. This involved |
| 7 | changing the return value of (vc-deduce-fileset) so that it passes | 12 | changing the return value of (vc-deduce-fileset) so that it passes |
| 8 | back a deduced state as well as a deduced back end, | 13 | back a deduced state as well as a deduced back end, |
diff --git a/lisp/vc.el b/lisp/vc.el index 7127225ad4c..4d0151b5046 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -1559,8 +1559,6 @@ returns t if the buffer had changes, nil otherwise." | |||
| 1559 | "Report diffs between revisions of the fileset in the repository history." | 1559 | "Report diffs between revisions of the fileset in the repository history." |
| 1560 | (interactive | 1560 | (interactive |
| 1561 | (let* ((vc-fileset (vc-deduce-fileset)) | 1561 | (let* ((vc-fileset (vc-deduce-fileset)) |
| 1562 | (backend (car files)) | ||
| 1563 | (state (cadr vc-fileset)) | ||
| 1564 | (files (cddr vc-fileset)) | 1562 | (files (cddr vc-fileset)) |
| 1565 | (first (car files)) | 1563 | (first (car files)) |
| 1566 | (completion-table | 1564 | (completion-table |
| @@ -2121,7 +2119,6 @@ If WORKING-REVISION is non-nil, leave the point at that revision." | |||
| 2121 | (interactive) | 2119 | (interactive) |
| 2122 | (let* ((vc-fileset (vc-deduce-fileset)) | 2120 | (let* ((vc-fileset (vc-deduce-fileset)) |
| 2123 | (backend (car vc-fileset)) | 2121 | (backend (car vc-fileset)) |
| 2124 | (state (cadr vc-fileset)) | ||
| 2125 | (files (cddr vc-fileset)) | 2122 | (files (cddr vc-fileset)) |
| 2126 | (working-revision (or working-revision (vc-working-revision (car files))))) | 2123 | (working-revision (or working-revision (vc-working-revision (car files))))) |
| 2127 | ;; Don't switch to the output buffer before running the command, | 2124 | ;; Don't switch to the output buffer before running the command, |
| @@ -2152,8 +2149,6 @@ This asks for confirmation if the buffer contents are not identical | |||
| 2152 | to the working revision (except for keyword expansion)." | 2149 | to the working revision (except for keyword expansion)." |
| 2153 | (interactive) | 2150 | (interactive) |
| 2154 | (let* ((vc-fileset (vc-deduce-fileset)) | 2151 | (let* ((vc-fileset (vc-deduce-fileset)) |
| 2155 | (backend (car vc-fileset)) | ||
| 2156 | (state (cadr vc-fileset)) | ||
| 2157 | (files (cddr vc-fileset))) | 2152 | (files (cddr vc-fileset))) |
| 2158 | ;; If any of the files is visited by the current buffer, make | 2153 | ;; If any of the files is visited by the current buffer, make |
| 2159 | ;; sure buffer is saved. If the user says `no', abort since | 2154 | ;; sure buffer is saved. If the user says `no', abort since |
| @@ -2186,7 +2181,6 @@ depending on the underlying version-control system." | |||
| 2186 | (interactive) | 2181 | (interactive) |
| 2187 | (let* ((vc-fileset (vc-deduce-fileset)) | 2182 | (let* ((vc-fileset (vc-deduce-fileset)) |
| 2188 | (backend (car vc-fileset)) | 2183 | (backend (car vc-fileset)) |
| 2189 | (state (cadr vc-fileset)) | ||
| 2190 | (files (cddr vc-fileset)) | 2184 | (files (cddr vc-fileset)) |
| 2191 | (granularity (vc-call-backend backend 'revision-granularity))) | 2185 | (granularity (vc-call-backend backend 'revision-granularity))) |
| 2192 | (unless (vc-find-backend-function backend 'rollback) | 2186 | (unless (vc-find-backend-function backend 'rollback) |
| @@ -2242,7 +2236,6 @@ changes from the current branch are merged into the working file." | |||
| 2242 | (interactive) | 2236 | (interactive) |
| 2243 | (let* ((vc-fileset (vc-deduce-fileset)) | 2237 | (let* ((vc-fileset (vc-deduce-fileset)) |
| 2244 | (backend (car vc-fileset)) | 2238 | (backend (car vc-fileset)) |
| 2245 | (state (cadr vc-fileset)) | ||
| 2246 | (files (cddr vc-fileset))) | 2239 | (files (cddr vc-fileset))) |
| 2247 | (dolist (file files) | 2240 | (dolist (file files) |
| 2248 | (when (let ((buf (get-file-buffer file))) | 2241 | (when (let ((buf (get-file-buffer file))) |