From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel 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 Message-ID: <529D3F52.3040304@yandex.ru> References: <871u1zes89.fsf@yandex.ru> <5298AA77.4060009@yandex.ru> <52991737.9000904@yandex.ru> <529A0C08.8010809@yandex.ru> <529BF309.4010109@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1386037097 22996 80.91.229.3 (3 Dec 2013 02:18:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Dec 2013 02:18:17 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 03 03:18:23 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VnfZ8-0004Hq-Cw for ged-emacs-devel@m.gmane.org; Tue, 03 Dec 2013 03:18:22 +0100 Original-Received: from localhost ([::1]:39800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnfZ7-0005Bt-VH for ged-emacs-devel@m.gmane.org; Mon, 02 Dec 2013 21:18:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnfYv-00059V-1i for emacs-devel@gnu.org; Mon, 02 Dec 2013 21:18:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnfYl-00016B-Du for emacs-devel@gnu.org; Mon, 02 Dec 2013 21:18:08 -0500 Original-Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:44879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnfYl-000166-72 for emacs-devel@gnu.org; Mon, 02 Dec 2013 21:17:59 -0500 Original-Received: by mail-wi0-f172.google.com with SMTP id en1so5819467wid.11 for ; Mon, 02 Dec 2013 18:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=tu9JSXKgyvASVSdshmxqesRiB0++byUptTvEI6NTl/M=; b=foZmpDdZMkYgy6a8386Zqj26d6iQxodbTbbSFuxwbuFuUe5zzhdsP1UqIFsb4p2XHa 9XQf5kCFWvFP8kFoZZ98+kw9zWTs89Ca8HFudnZp3KTuIiDo7ooJHM8LwV3MiGEliRHJ moLPMlqqyFMihYFxXFPA80bv9mCtBt71ZYM5Pm9X6P2KPBfvK3PqvGLyobXvk2UG5SRf d38Kwd+3rS5nFdcfc5lV7b1slfSEzK3Wr+3shL88r/cRPPXPsWBYRokfIjiCxSnlj8zl N3kUO0S1W7E7CyfgtM1zF0wMjtWrZrJQHWh+gu4AbDuTKB6sVGNWQUvZ8mW70TUEiDO5 DEzw== X-Received: by 10.180.108.42 with SMTP id hh10mr248039wib.15.1386037077880; Mon, 02 Dec 2013 18:17:57 -0800 (PST) Original-Received: from [192.168.10.2] ([62.228.136.233]) by mx.google.com with ESMTPSA id uc18sm818615wib.11.2013.12.02.18.17.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 18:17:57 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22c X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:166024 Archived-At: 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)