unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Dmitry Gutov <dgutov@yandex.ru>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: trunk r115265: * lisp/vc/vc-dispatcher.el (vc-log-edit): Setup the Summary&Author headers.
Date: Tue, 03 Dec 2013 04:17:54 +0200	[thread overview]
Message-ID: <529D3F52.3040304@yandex.ru> (raw)
In-Reply-To: <jwvd2lf4b4p.fsf-monnier+emacs@gnu.org>

On 02.12.2013 15:53, Stefan Monnier wrote:
> It's probably the case that log-edit-hide-buf needs to be revisited,
> since it dates to before the rewrite of display-buffer, where Martin
> arranged to better be able to "undo" a display-buffer (via bury-buffer
> or quit-window).

The patch below seems to work. It still feels duct tapey, but I haven't 
found a way to make `pop-to-buffer' split one specific window, short of 
writing a new display-buffer-function.


=== modified file 'lisp/vc/log-edit.el'
--- lisp/vc/log-edit.el	2013-12-02 22:13:51 +0000
+++ lisp/vc/log-edit.el	2013-12-03 01:53:23 +0000
@@ -480,13 +480,8 @@

  (defun log-edit-hide-buf (&optional buf where)
    (when (setq buf (get-buffer (or buf log-edit-files-buf)))
-    ;; 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'.
      (save-selected-window
-      (let ((win (get-buffer-window buf where)))
-        (if win (ignore-errors (delete-window win))))
-      (bury-buffer buf))))
+      (quit-windows-on buf))))

  (defun log-edit-add-new-comment (comment)
    (when (or (ring-empty-p log-edit-comment-ring)

=== modified file 'lisp/vc/pcvs-util.el'
--- lisp/vc/pcvs-util.el	2013-08-05 14:26:57 +0000
+++ lisp/vc/pcvs-util.el	2013-12-03 02:07:30 +0000
@@ -89,7 +89,10 @@
      (or (let ((buf (get-buffer-window buf))) (and buf (select-window 
buf)))
  	(and pop-up-windows
  	     (ignore-errors (select-window (split-window-below)))
-	     (switch-to-buffer buf nil 'force-same-window))
+             (prog1
+                 (switch-to-buffer buf t 'force-same-window)
+               (set-window-prev-buffers nil nil)
+               (display-buffer-record-window 'window nil 
(current-buffer))))
  	(pop-to-buffer (current-buffer)))))

  (defun cvs-bury-buffer (buf &optional mainbuf)




  parent reply	other threads:[~2013-12-03  2:17 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <E1VlqjS-0006O3-Fn@vcs.savannah.gnu.org>
2013-11-29  4:39 ` trunk r115265: * lisp/vc/vc-dispatcher.el (vc-log-edit): Setup the Summary&Author headers Dmitry Gutov
2013-11-29 13:33   ` Stefan Monnier
2013-11-29 14:53     ` Dmitry Gutov
2013-11-29 17:04       ` Stefan Monnier
2013-11-29 22:37         ` Dmitry Gutov
2013-11-30  2:29           ` Stefan Monnier
2013-11-30 16:02             ` Dmitry Gutov
2013-12-01 21:10               ` Stefan Monnier
2013-12-02  2:40                 ` Dmitry Gutov
2013-12-02 13:53                   ` Stefan Monnier
2013-12-02 23:02                     ` Dmitry Gutov
2013-12-03  0:56                       ` Leo Liu
2013-12-03  3:06                       ` Stefan Monnier
2013-12-04  0:38                         ` Dmitry Gutov
2013-12-03  2:17                     ` Dmitry Gutov [this message]
2013-12-03  3:09                       ` Stefan Monnier
2013-12-04  0:43                         ` Dmitry Gutov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=529D3F52.3040304@yandex.ru \
    --to=dgutov@yandex.ru \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).