diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2013-12-02 05:03:40 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2013-12-02 05:03:40 +0200 |
| commit | 3adc9c6dca2c52aa41165f112a4e875267c6315e (patch) | |
| tree | 7bfbc3c54d89c1602dc55838e7c61c95f36a084f /lisp | |
| parent | d9dfe8ca078e22a94952cbbe4095b8209ed4f6c4 (diff) | |
| download | emacs-3adc9c6dca2c52aa41165f112a4e875267c6315e.tar.gz emacs-3adc9c6dca2c52aa41165f112a4e875267c6315e.tar.bz2 emacs-3adc9c6dca2c52aa41165f112a4e875267c6315e.zip | |
Fix minor log-edit-show-files annoyances
* lisp/vc/log-edit.el (log-edit-kill-buffer): Move the use of
`save-selected-window' to `log-edit-hide-buf'. This makes
`log-edit-show-files' idempotent.
(log-edit-show-files): Mark the new window as dedicated.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc/log-edit.el | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6acc2c7a2d5..b943b3c5fa8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2013-12-02 Dmitry Gutov <dgutov@yandex.ru> + * vc/log-edit.el (log-edit-kill-buffer): Move the use of + `save-selected-window' to `log-edit-hide-buf'. This makes + `log-edit-show-files' idempotent. + (log-edit-show-files): Mark the new window as dedicated. + +2013-12-02 Dmitry Gutov <dgutov@yandex.ru> + * vc/log-edit.el (log-edit-mode-map): Add binding for `log-edit-kill-biffer'. (log-edit-hide-buf): Add a FIXME comment. diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 3c15d9147b6..0845284d6cc 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -483,9 +483,10 @@ commands (under C-x v for VC, for example). ;; FIXME: Should use something like `quit-windows-on' here, but ;; that function never deletes this buffer's window because it ;; was created using `cvs-pop-to-buffer-same-frame'. - (let ((win (get-buffer-window buf where))) - (if win (ignore-errors (delete-window win)))) - (bury-buffer buf))) + (save-selected-window + (let ((win (get-buffer-window buf where))) + (if win (ignore-errors (delete-window win)))) + (bury-buffer buf)))) (defun log-edit-add-new-comment (comment) (when (or (ring-empty-p log-edit-comment-ring) @@ -545,8 +546,7 @@ Also saves its contents in the comment history and hides `log-edit-files-buf'." (interactive) (log-edit-add-new-comment (buffer-string)) - (save-selected-window - (log-edit-hide-buf)) + (log-edit-hide-buf) (let ((buf (current-buffer))) (quit-windows-on buf) (kill-buffer buf))) @@ -604,6 +604,7 @@ Also saves its contents in the comment history and hides (save-selected-window (cvs-pop-to-buffer-same-frame buf) (shrink-window-if-larger-than-buffer) + (set-window-dedicated-p (selected-window) t) (selected-window))))) (defun log-edit-beginning-of-line (&optional n) |