diff options
| author | Eric S. Raymond | 2007-10-06 14:36:09 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2007-10-06 14:36:09 +0000 |
| commit | d6ba9c398efbd6bec64b897cc4ae3733bee30f98 (patch) | |
| tree | e705a35640b9ceefa039da4557efaadc0f395612 | |
| parent | a6e9632782dec4435e8b85a7a262443d62d6e2cc (diff) | |
| download | emacs-d6ba9c398efbd6bec64b897cc4ae3733bee30f98.tar.gz emacs-d6ba9c398efbd6bec64b897cc4ae3733bee30f98.zip | |
Typo and whitespace fixes to reduce the diff with new VC.
| -rw-r--r-- | lisp/vc.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 042f9191737..4ef359e6c1c 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -347,7 +347,7 @@ | |||
| 347 | ;; | 347 | ;; |
| 348 | ;; - comment-history (file) | 348 | ;; - comment-history (file) |
| 349 | ;; | 349 | ;; |
| 350 | ;; Return a string containing all log entries that were madoe for FILE. | 350 | ;; Return a string containing all log entries that were made for FILE. |
| 351 | ;; This is used for transferring a file from one backend to another, | 351 | ;; This is used for transferring a file from one backend to another, |
| 352 | ;; retaining comment information. The default implementation of this | 352 | ;; retaining comment information. The default implementation of this |
| 353 | ;; function does this by calling print-log and then wash-log, and | 353 | ;; function does this by calling print-log and then wash-log, and |
| @@ -1326,7 +1326,6 @@ message has been entered, it checks in the resulting changes along | |||
| 1326 | with the logmessage as change commentary. A writable file is retained. | 1326 | with the logmessage as change commentary. A writable file is retained. |
| 1327 | If the repository file is changed, you are asked if you want to | 1327 | If the repository file is changed, you are asked if you want to |
| 1328 | merge in the changes into your working copy." | 1328 | merge in the changes into your working copy." |
| 1329 | |||
| 1330 | (interactive "P") | 1329 | (interactive "P") |
| 1331 | (catch 'nogo | 1330 | (catch 'nogo |
| 1332 | (if vc-dired-mode | 1331 | (if vc-dired-mode |
| @@ -1751,7 +1750,8 @@ the buffer contents as a comment." | |||
| 1751 | ;; But not if it is a vc-dired buffer. | 1750 | ;; But not if it is a vc-dired buffer. |
| 1752 | (with-current-buffer vc-parent-buffer | 1751 | (with-current-buffer vc-parent-buffer |
| 1753 | (or vc-dired-mode (vc-buffer-sync))) | 1752 | (or vc-dired-mode (vc-buffer-sync))) |
| 1754 | (if (not vc-log-operation) (error "No log operation is pending")) | 1753 | (if (not vc-log-operation) |
| 1754 | (error "No log operation is pending")) | ||
| 1755 | ;; save the parameters held in buffer-local variables | 1755 | ;; save the parameters held in buffer-local variables |
| 1756 | (let ((log-operation vc-log-operation) | 1756 | (let ((log-operation vc-log-operation) |
| 1757 | (log-file vc-log-file) | 1757 | (log-file vc-log-file) |