diff options
| author | Lars Magne Ingebrigtsen | 2011-07-03 03:15:38 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-03 03:15:38 +0200 |
| commit | ce1438d696bd670b5aba5690ce4f73b836b20194 (patch) | |
| tree | dd0bd75361f681f99ddf61609beb70ea1e7e9f15 | |
| parent | 3653687a1b337db8f78d9e96c54a6e003d2af409 (diff) | |
| download | emacs-ce1438d696bd670b5aba5690ce4f73b836b20194.tar.gz emacs-ce1438d696bd670b5aba5690ce4f73b836b20194.zip | |
* vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log*
for consistency with the other vc buffers (bug#6197).
(vc-checkin): Ditto.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc/vc-arch.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fcc26fab9c0..17f48ea7b12 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log* | ||
| 4 | for consistency with the other vc buffers (bug#6197). | ||
| 5 | (vc-checkin): Ditto. | ||
| 6 | |||
| 7 | * vc/vc-arch.el: Fix comments to match the *VC-log* name change. | ||
| 8 | |||
| 3 | * longlines.el (longlines-mode): Document what ARG does (bug#6150). | 9 | * longlines.el (longlines-mode): Document what ARG does (bug#6150). |
| 4 | 10 | ||
| 5 | 2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> | 11 | 2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> |
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 59cefe047b6..eeac55ac0f8 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | 39 | ||
| 40 | ;; Bugs: | 40 | ;; Bugs: |
| 41 | 41 | ||
| 42 | ;; - *VC-log*'s initial content lacks the `Summary:' lines. | 42 | ;; - *vc-log*'s initial content lacks the `Summary:' lines. |
| 43 | ;; - All files under the tree are considered as "under Arch's control" | 43 | ;; - All files under the tree are considered as "under Arch's control" |
| 44 | ;; without regards to =tagging-method and such. | 44 | ;; without regards to =tagging-method and such. |
| 45 | ;; - Files are always considered as `edited'. | 45 | ;; - Files are always considered as `edited'. |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 5ec4c3998d8..e3f3c153043 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -620,7 +620,7 @@ | |||
| 620 | ;; buffer, if one is present, instead of adding to the ChangeLog. | 620 | ;; buffer, if one is present, instead of adding to the ChangeLog. |
| 621 | ;; | 621 | ;; |
| 622 | ;; - When vc-next-action calls vc-checkin it could pre-fill the | 622 | ;; - When vc-next-action calls vc-checkin it could pre-fill the |
| 623 | ;; *VC-log* buffer with some obvious items: the list of files that | 623 | ;; *vc-log* buffer with some obvious items: the list of files that |
| 624 | ;; were added, the list of files that were removed. If the diff is | 624 | ;; were added, the list of files that were removed. If the diff is |
| 625 | ;; available, maybe it could even call something like | 625 | ;; available, maybe it could even call something like |
| 626 | ;; `diff-add-change-log-entries-other-window' to create a detailed | 626 | ;; `diff-add-change-log-entries-other-window' to create a detailed |
| @@ -1414,7 +1414,7 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'." | |||
| 1414 | (vc-start-logentry | 1414 | (vc-start-logentry |
| 1415 | files comment initial-contents | 1415 | files comment initial-contents |
| 1416 | "Enter a change comment." | 1416 | "Enter a change comment." |
| 1417 | "*VC-log*" | 1417 | "*vc-log*" |
| 1418 | (lambda () | 1418 | (lambda () |
| 1419 | (vc-call-backend backend 'log-edit-mode)) | 1419 | (vc-call-backend backend 'log-edit-mode)) |
| 1420 | (lexical-let ((rev rev)) | 1420 | (lexical-let ((rev rev)) |
| @@ -1876,7 +1876,7 @@ The headers are reset to their non-expanded form." | |||
| 1876 | (vc-start-logentry | 1876 | (vc-start-logentry |
| 1877 | files oldcomment t | 1877 | files oldcomment t |
| 1878 | "Enter a replacement change comment." | 1878 | "Enter a replacement change comment." |
| 1879 | "*VC-log*" | 1879 | "*vc-log*" |
| 1880 | (lambda () (vc-call-backend backend 'log-edit-mode)) | 1880 | (lambda () (vc-call-backend backend 'log-edit-mode)) |
| 1881 | (lexical-let ((rev rev)) | 1881 | (lexical-let ((rev rev)) |
| 1882 | (lambda (files comment) | 1882 | (lambda (files comment) |