# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1184962101 0
# Node ID b450385acac9b88e14b4e5022a254635b1fc91f4
# Parent  066eaef90bfbf51bb8c664dbf4637114aac2fb10
(cvs-mode-add-change-log-entry-other-window): Use a directory
name for buffer-file-name if it refers to a directory.

diff -r 066eaef90bfb -r b450385acac9 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jul 20 20:02:32 2007 +0000
+++ b/lisp/ChangeLog	Fri Jul 20 20:08:21 2007 +0000
@@ -1,5 +1,8 @@
 2007-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* pcvs.el (cvs-mode-add-change-log-entry-other-window): Use a directory
+	name for buffer-file-name if it refers to a directory.
+
 	* vc-arch.el (vc-arch-diff): Fix last change.
 
 	* progmodes/compile.el (compilation-start): Remember the original
diff -r 066eaef90bfb -r b450385acac9 lisp/pcvs.el
--- a/lisp/pcvs.el	Fri Jul 20 20:02:32 2007 +0000
+++ b/lisp/pcvs.el	Fri Jul 20 20:08:21 2007 +0000
@@ -2207,6 +2207,10 @@
   (dolist (fi (cvs-mode-marked nil nil))
     (let* ((default-directory (cvs-expand-dir-name (cvs-fileinfo->dir fi)))
 	   (buffer-file-name (expand-file-name (cvs-fileinfo->file fi))))
+      (if (file-directory-p buffer-file-name)
+          ;; Be careful to use a directory name, otherwise add-log starts
+          ;; looking for a ChangeLog file in the parent dir.
+          (setq buffer-file-name (file-name-as-directory buffer-file-name)))
       (kill-local-variable 'change-log-default-name)
       (save-excursion (add-change-log-entry-other-window)))))