mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-22 05:51:11 -07:00
Code Issues Projects Releases Wiki Activity

(cvs-mode-add-change-log-entry-other-window): Use

Browse source 
add-log-buffer-file-name-function rather than bind buffer-file-name,
so we dont end up calling change-log-mode in *cvs* when `fi' is the
ChangeLog file itself.
This commit is contained in:
Stefan Monnier 2007-09-08 03:11:43 +00:00
parent b7e5bc1c44
commit fd071fdf4c
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,5 +1,10 @@
2007-09-08 Stefan Monnier <monnier@iro.umontreal.ca>
* pcvs.el (cvs-mode-add-change-log-entry-other-window): Use
add-log-buffer-file-name-function rather than bind buffer-file-name,
so we dont end up calling change-log-mode in *cvs* when `fi' is the
ChangeLog file itself.
* outline.el (outline-flag-region): Use front-advance.
2007-09-07 Ilya Zakharevich <ilyaz@cpan.org>

18
lisp/pcvs.el
View file

@ -2210,13 +2210,21 @@ With prefix argument, prompt for cvs flags."
(defun-cvs-mode cvs-mode-add-change-log-entry-other-window ()
"Add a ChangeLog entry in the ChangeLog of the current directory."
(interactive)
;; Require `add-log' explicitly, because if it gets autoloaded when we call
;; add-change-log-entry-other-window below, the
;; add-log-buffer-file-name-function ends up unbound when we leave the `let'.
(require 'add-log)
(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)))
(add-log-buffer-file-name-function
(lambda ()
(let ((file (expand-file-name (cvs-fileinfo->file fi))))
(if (file-directory-p file)
;; Be careful to use a directory name, otherwise add-log
;; starts looking for a ChangeLog file in the
;; parent dir.
(file-name-as-directory file)
file)))))
(kill-local-variable 'change-log-default-name)
(save-excursion (add-change-log-entry-other-window)))))