aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-05-06 22:19:48 +0000
committerStefan Monnier2005-05-06 22:19:48 +0000
commit5f4d0dd97e7187e7bc9d808ece4758cf39bf079d (patch)
treeab8573f6fcc5c923c24af8dd782fc5a1b0fcf742
parent7ec64183c149b38c886352d60e2a062b4df8353a (diff)
downloademacs-5f4d0dd97e7187e7bc9d808ece4758cf39bf079d.tar.gz
emacs-5f4d0dd97e7187e7bc9d808ece4758cf39bf079d.zip
(cvs-mode-commit, cvs-mode-edit-log): Don't fiddle with
list-buffers-directory. This caused the *cvs-commit* buffer to be sometimes mistakenly reused as a *cvs* buffer.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/pcvs.el4
2 files changed, 8 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e487f3e3486..d6cc0b60657 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12005-05-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * pcvs.el (cvs-mode-commit, cvs-mode-edit-log): Don't fiddle with
4 list-buffers-directory. This caused the *cvs-commit* buffer to be
5 sometimes mistakenly reused as a *cvs* buffer.
6
12005-05-07 Nick Roberts <nickrob@snap.net.nz> 72005-05-07 Nick Roberts <nickrob@snap.net.nz>
2 8
3 * tooltip.el: Move code for GUD tooltips into gud.el. 9 * tooltip.el: Move code for GUD tooltips into gud.el.
@@ -33,9 +39,9 @@
33 (gud-tooltip-original-filter, gud-tooltip-dereference) 39 (gud-tooltip-original-filter, gud-tooltip-dereference)
34 (gud-tooltip-event, tooltip-toggle-gud-tips) 40 (gud-tooltip-event, tooltip-toggle-gud-tips)
35 (gud-tooltip-process-output, gud-tooltip-print-command) 41 (gud-tooltip-process-output, gud-tooltip-print-command)
36 (gud-tooltip-tips): Moved from tooltip.el. 42 (gud-tooltip-tips): Move from tooltip.el.
37 43
38 * progmodes/gdb-ui.el (gdb-tooltip-print): Moved from tooltip.el. 44 * progmodes/gdb-ui.el (gdb-tooltip-print): Move from tooltip.el.
39 (gdb-cpp-define-alist-flags): Doc fix. 45 (gdb-cpp-define-alist-flags): Doc fix.
40 (gdb-set-gud-minor-mode-1): Only prepare GUD tooltips if 46 (gdb-set-gud-minor-mode-1): Only prepare GUD tooltips if
41 gud-tooltip-mode is t. 47 gud-tooltip-mode is t.
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 6382705139e..7c96a080c54 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1438,12 +1438,10 @@ The POSTPROC specified there (typically `log-edit') is then called,
1438 ;; displayed in the wrong minibuffer). 1438 ;; displayed in the wrong minibuffer).
1439 (cvs-mode!) 1439 (cvs-mode!)
1440 (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup)) 1440 (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup))
1441 (lbd list-buffers-directory)
1442 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist))) 1441 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist)))
1443 'log-edit))) 1442 'log-edit)))
1444 (funcall setupfun 'cvs-do-commit setup 'cvs-commit-filelist buf) 1443 (funcall setupfun 'cvs-do-commit setup 'cvs-commit-filelist buf)
1445 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-commit-minor-wrap) 1444 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-commit-minor-wrap)
1446 (set (make-local-variable 'list-buffers-directory) lbd)
1447 (run-hooks 'cvs-mode-commit-hook))) 1445 (run-hooks 'cvs-mode-commit-hook)))
1448 1446
1449(defun cvs-commit-minor-wrap (buf f) 1447(defun cvs-commit-minor-wrap (buf f)
@@ -1494,14 +1492,12 @@ This is best called from a `log-view-mode' buffer."
1494 ;; displayed in the wrong minibuffer). 1492 ;; displayed in the wrong minibuffer).
1495 (cvs-mode!) 1493 (cvs-mode!)
1496 (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup)) 1494 (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup))
1497 (lbd list-buffers-directory)
1498 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist))) 1495 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist)))
1499 'log-edit))) 1496 'log-edit)))
1500 (funcall setupfun 'cvs-do-edit-log nil 'cvs-edit-log-filelist buf) 1497 (funcall setupfun 'cvs-do-edit-log nil 'cvs-edit-log-filelist buf)
1501 (when text (erase-buffer) (insert text)) 1498 (when text (erase-buffer) (insert text))
1502 (set (make-local-variable 'cvs-edit-log-revision) rev) 1499 (set (make-local-variable 'cvs-edit-log-revision) rev)
1503 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-edit-log-minor-wrap) 1500 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-edit-log-minor-wrap)
1504 (set (make-local-variable 'list-buffers-directory) lbd)
1505 ;; (run-hooks 'cvs-mode-commit-hook) 1501 ;; (run-hooks 'cvs-mode-commit-hook)
1506 )) 1502 ))
1507 1503