diff options
| author | Glenn Morris | 2014-07-10 14:09:04 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-07-10 14:09:04 -0400 |
| commit | 46b7604ea4e0a27db09be6cc9e980812bde142bf (patch) | |
| tree | fcea8b929ab1e49a73fa624f2c7de5ca50866758 | |
| parent | 5d71cc6bfd658ae103baf9fb30de5daa2681b723 (diff) | |
| download | emacs-46b7604ea4e0a27db09be6cc9e980812bde142bf.tar.gz emacs-46b7604ea4e0a27db09be6cc9e980812bde142bf.zip | |
Tweak previous log-edit-changelog-entries change
* lisp/vc/log-edit.el (log-edit-changelog-entries):
Check for a visited-but-never-saved ChangeLog.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/log-edit.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a236e0470bc..ba53fec8e4f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-07-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * vc/log-edit.el (log-edit-changelog-entries): | ||
| 4 | Check for a visited-but-never-saved ChangeLog. | ||
| 5 | |||
| 1 | 2014-07-09 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-07-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc/log-edit.el (log-edit-changelog-entries): Don't both visiting | 8 | * vc/log-edit.el (log-edit-changelog-entries): Don't both visiting |
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 322a9057fbc..3b03ee14c0b 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el | |||
| @@ -905,7 +905,8 @@ where LOGBUFFER is the name of the ChangeLog buffer, and each | |||
| 905 | ;; that memoizing which is undesired here. | 905 | ;; that memoizing which is undesired here. |
| 906 | (setq change-log-default-name nil) | 906 | (setq change-log-default-name nil) |
| 907 | (find-change-log))))) | 907 | (find-change-log))))) |
| 908 | (when (file-exists-p changelog-file-name) | 908 | (when (or (find-buffer-visiting changelog-file-name) |
| 909 | (file-exists-p changelog-file-name)) | ||
| 909 | (with-current-buffer (find-file-noselect changelog-file-name) | 910 | (with-current-buffer (find-file-noselect changelog-file-name) |
| 910 | (unless (eq major-mode 'change-log-mode) (change-log-mode)) | 911 | (unless (eq major-mode 'change-log-mode) (change-log-mode)) |
| 911 | (goto-char (point-min)) | 912 | (goto-char (point-min)) |