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 @@
+2014-07-10  Glenn Morris  <rgm@gnu.org>
+
+        * vc/log-edit.el (log-edit-changelog-entries):
+        Check for a visited-but-never-saved ChangeLog.
+
 2014-07-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * 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
              ;; that memoizing which is undesired here.
              (setq change-log-default-name nil)
              (find-change-log)))))
-    (when (file-exists-p changelog-file-name)
+    (when (or (find-buffer-visiting changelog-file-name)
+              (file-exists-p changelog-file-name))
       (with-current-buffer (find-file-noselect changelog-file-name)
         (unless (eq major-mode 'change-log-mode) (change-log-mode))
         (goto-char (point-min))