From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#12218: 24.2.50; vc-ediff: Pressing `n' moves focus away from ediff control panel Date: Tue, 12 Feb 2013 19:47:31 +0200 Organization: JURTA Message-ID: <87zjz9r733.fsf@mail.jurta.org> References: <87pq6pvmw4.fsf@gmail.com> <506F076B.9040204@gmx.at> <874nm8alm4.fsf@gmail.com> <506F21F5.1050208@gmx.at> <877gr44v08.fsf@gmail.com> <506F3001.1030305@gmx.at> <87391sg0z4.fsf@gmail.com> <506FE852.5020603@gmx.at> <87k3v3ebo3.fsf@mail.jurta.org> <50727922.7010301@gmx.at> <87r4p919r7.fsf@mail.jurta.org> <878v6wmo7j.fsf@mail.jurta.org> <5117D9C9.9050608@gmx.at> <87k3qf9oog.fsf@mail.jurta.org> <87621zb2yb.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1360691980 12265 80.91.229.3 (12 Feb 2013 17:59:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Feb 2013 17:59:40 +0000 (UTC) Cc: 12218@debbugs.gnu.org To: Jambunathan K Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 12 19:00:01 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1U5K9A-00083q-F2 for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Feb 2013 19:00:00 +0100 Original-Received: from localhost ([::1]:36753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5K8r-0003wD-0P for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Feb 2013 12:59:41 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:56609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5K8n-0003th-JC for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2013 12:59:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5K8m-0007R8-DM for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2013 12:59:37 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5K8m-0007R1-AE for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2013 12:59:36 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1U5K9C-00023J-94 for bug-gnu-emacs@gnu.org; Tue, 12 Feb 2013 13:00:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 Feb 2013 18:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12218 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12218-submit@debbugs.gnu.org id=B12218.13606919887816 (code B ref 12218); Tue, 12 Feb 2013 18:00:02 +0000 Original-Received: (at 12218) by debbugs.gnu.org; 12 Feb 2013 17:59:48 +0000 Original-Received: from localhost ([127.0.0.1]:52515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U5K8w-00021z-VY for submit@debbugs.gnu.org; Tue, 12 Feb 2013 12:59:47 -0500 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:36598 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U5K8u-00021l-1q for 12218@debbugs.gnu.org; Tue, 12 Feb 2013 12:59:45 -0500 Original-Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 2E188201C9F033; Tue, 12 Feb 2013 09:59:14 -0800 (PST) In-Reply-To: <87621zb2yb.fsf@gmail.com> (Jambunathan K.'s message of "Mon, 11 Feb 2013 15:13:40 +0530") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:71104 Archived-At: >> But unfortunately I can't reproduce this bug reliably >> to try various solutions. > > If you circulate a diff, I can try it out, as many times as you want. Please try this patch: === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2013-01-03 00:36:36 +0000 +++ lisp/vc/ediff-util.el 2013-02-12 17:47:25 +0000 @@ -786,7 +786,11 @@ (defun ediff-recenter (&optional no-rehi (frame-live-p ediff-control-frame) (not ediff-use-long-help-message) (not (ediff-frame-iconified-p ediff-control-frame))) - (raise-frame ediff-control-frame)) + (if (fboundp 'select-frame-set-input-focus) + (select-frame-set-input-focus ediff-control-frame) + (raise-frame ediff-control-frame) + (select-frame ediff-control-frame) + (focus-frame ediff-control-frame))) ;; Redisplay whatever buffers are showing, if there is a selected difference (let ((control-frame ediff-control-frame)