Mercurial > emacs
changeset 108002:c609e6e60b3d
* vc-dispatcher (vc-finish-logentry): Don't mess with the windows/frames.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 20 Apr 2010 12:52:43 -0400 |
| parents | 3d52b4ac976f |
| children | 4b71850034e6 |
| files | lisp/ChangeLog lisp/vc-dispatcher.el |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Apr 20 12:37:31 2010 -0400 +++ b/lisp/ChangeLog Tue Apr 20 12:52:43 2010 -0400 @@ -1,5 +1,8 @@ 2010-04-20 Stefan Monnier <monnier@iro.umontreal.ca> + * vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with the + windows/frames. + * emacs-lisp/lisp.el (lisp-completion-at-point): Complete around point. I.e. include text after point in the completion region. Also, return nil when we're not after/in a symbol.
--- a/lisp/vc-dispatcher.el Tue Apr 20 12:37:31 2010 -0400 +++ b/lisp/vc-dispatcher.el Tue Apr 20 12:52:43 2010 -0400 @@ -599,8 +599,7 @@ (log-extra vc-log-extra) (log-entry (buffer-string)) (extra-flags log-edit-extra-flags) - (after-hook vc-log-after-operation-hook) - (tmp-vc-parent-buffer vc-parent-buffer)) + (after-hook vc-log-after-operation-hook)) (pop-to-buffer vc-parent-buffer) ;; OK, do it to it (save-excursion @@ -617,9 +616,11 @@ (delete-windows-on logbuf (selected-frame)) ;; Kill buffer and delete any other dedicated windows/frames. (kill-buffer logbuf)) - (logbuf (pop-to-buffer logbuf) - (bury-buffer) - (pop-to-buffer tmp-vc-parent-buffer))) + (logbuf + (with-selected-window (or (get-buffer-window logbuf 0) + (selected-window)) + (with-current-buffer logbuf + (bury-buffer))))) ;; Now make sure we see the expanded headers (when log-fileset (mapc