From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.bugs Subject: bug#22332: 25.0.50; woman moves point in a wrong buffer Date: Sat, 9 Jan 2016 11:36:13 -0500 Message-ID: References: <87y4c0ylnl.fsf@gmail.com> <5690D1EE.4000306@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a113b19caaa1b440528e94f2d X-Trace: ger.gmane.org 1452357442 9116 80.91.229.3 (9 Jan 2016 16:37:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 9 Jan 2016 16:37:22 +0000 (UTC) Cc: Ari Roponen , 22332@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jan 09 17:37:13 2016 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 1aHwVp-0001SI-Qg for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Jan 2016 17:37:10 +0100 Original-Received: from localhost ([::1]:41227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHwVp-00078F-33 for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Jan 2016 11:37:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHwVl-000788-QS for bug-gnu-emacs@gnu.org; Sat, 09 Jan 2016 11:37:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHwVi-0000L4-Gd for bug-gnu-emacs@gnu.org; Sat, 09 Jan 2016 11:37:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56344) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHwVi-0000L0-Bi for bug-gnu-emacs@gnu.org; Sat, 09 Jan 2016 11:37:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aHwVi-0003o4-42 for bug-gnu-emacs@gnu.org; Sat, 09 Jan 2016 11:37:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Kaushal Modi Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 09 Jan 2016 16:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22332 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22332-submit@debbugs.gnu.org id=B22332.145235742014622 (code B ref 22332); Sat, 09 Jan 2016 16:37:02 +0000 Original-Received: (at 22332) by debbugs.gnu.org; 9 Jan 2016 16:37:00 +0000 Original-Received: from localhost ([127.0.0.1]:44564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aHwVf-0003nm-Mp for submit@debbugs.gnu.org; Sat, 09 Jan 2016 11:36:59 -0500 Original-Received: from mail-oi0-f50.google.com ([209.85.218.50]:36303) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aHwVe-0003nV-3q for 22332@debbugs.gnu.org; Sat, 09 Jan 2016 11:36:58 -0500 Original-Received: by mail-oi0-f50.google.com with SMTP id o124so20245397oia.3 for <22332@debbugs.gnu.org>; Sat, 09 Jan 2016 08:36:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=im5jqFdBuncvoO2GRGOBlhJi6U7aareEkA6sHNQLIRA=; b=JZshW/U4a8lozzOdGU2Vxnena+vuFgE8+8C4dzg7Y2HYt50m2BcvS4EJ27TLvQJWdB UDH+qTN7ON615PQPAv/9q1N6k3pMEb09TwqfMrW/2hO3Ht7jjyS2ShUX0Ib827Luv4Sb u4GmiLRCZihive+cMNNc9v0XIQaM+ur9FreFbftuTU2NX6PCZUFHPovat5rbDi0hskqV XNqxMNEV4MD+tKqcHAbg/qgFLeYAYHCLUv/E9lZrue0dTZzUhSt9VH7KyrbeH7Bv8Rnq nCjzmksEw6u2d23BOuVDW+sxp9C4g9tdeO20L5r79wvMl/QLwalnH34MERzL5QGZkLax b3Zg== X-Received: by 10.202.81.18 with SMTP id f18mr86334040oib.68.1452357412590; Sat, 09 Jan 2016 08:36:52 -0800 (PST) Original-Received: by 10.202.201.78 with HTTP; Sat, 9 Jan 2016 08:36:13 -0800 (PST) In-Reply-To: <5690D1EE.4000306@gmx.at> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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:111428 Archived-At: --001a113b19caaa1b440528e94f2d Content-Type: text/plain; charset=UTF-8 Hi Martin, Ari, I should have read the documentation of WoMan-find-buffer before sending that earlier patch. Here's a patch to fix that. - The display-buffer is still retained in WoMan-find-buffer so that the display-buffer-alist rules can apply. But after that the switch-to-buffer calls are added so that (1) the point switches to the WoMan buffer, and (2) WoMan-find-buffer returns the buffer name (instead of the window name, which display-buffer returns). Ari: Please let us know if the patch fixes the bug for you. I have verified it to fix it for me locally. Martin: Can you please commit this patch once it is verified by Ari and you? Thanks. ====== >From db908f6fc7bd64266744a32664d9c60fb132595a Mon Sep 17 00:00:00 2001 From: Kaushal Modi Date: Sat, 9 Jan 2016 11:29:40 -0500 Subject: [PATCH] WoMan-find-buffer switches to/returns buffer - Fix for bug #22332 --- lisp/woman.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/woman.el b/lisp/woman.el index 4ca7dbe..24dbd63 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2061,20 +2061,23 @@ WoMan-find-buffer (if (zerop woman-buffer-number) (let ((buffer (get-buffer (cdr (car woman-buffer-alist))))) (if buffer - (display-buffer buffer) + (progn + (display-buffer buffer) + (switch-to-buffer buffer)) ;; Delete alist element: (setq woman-buffer-alist (cdr woman-buffer-alist)) nil)) (let* ((prev-ptr (nthcdr (1- woman-buffer-number) woman-buffer-alist)) (buffer (get-buffer (cdr (car (cdr prev-ptr)))))) (if buffer - (display-buffer buffer) + (progn + (display-buffer buffer) + (switch-to-buffer buffer)) ;; Delete alist element: (setcdr prev-ptr (cdr (cdr prev-ptr))) (if (>= woman-buffer-number (length woman-buffer-alist)) (setq woman-buffer-number 0)) nil)))) - ;;; Syntax and display tables: -- 2.6.0.rc0.24.gec371ff --001a113b19caaa1b440528e94f2d Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Martin, Ari,

I should have read the = documentation of WoMan-find-buffer before sending that earlier patch.
=

Here's a patch to fix that.
- The display= -buffer is still retained in WoMan-find-buffer so that the display-buffer-a= list rules can apply. But after that the switch-to-buffer calls are added s= o that (1) the point switches to the WoMan buffer, and (2) WoMan-find-buffe= r returns the buffer name (instead of the window name, which display-buffer= returns).


Ari: Please let us know = if the patch fixes the bug for you. I have verified it to fix it for me loc= ally.
Martin: Can you please commit this patch once it is verifie= d by Ari and you?

Thanks.


=3D=3D=3D=3D=3D=3D

From db908= f6fc7bd64266744a32664d9c60fb132595a Mon Sep 17 00:00:00 2001
From= : Kaushal Modi <kaushal.modi@g= mail.com>
Date: Sat, 9 Jan 2016 11:29:40 -0500
S= ubject: [PATCH] WoMan-find-buffer switches to/returns buffer

=
- Fix for bug #22332
---
=C2=A0lisp/woman.el= | 9 ++++++---
=C2=A01 file changed, 6 insertions(+), 3 deletions= (-)

diff --git a/lisp/woman.el b/lisp/woman.el
index 4ca7dbe..24dbd63 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2061,20 +2061,23 @@ WoMan-find-buffer
=C2=A0 =C2=A0(if (zerop woman-buffer-number)
=C2=A0 =C2= =A0 =C2=A0 =C2=A0(let ((buffer (get-buffer (cdr (car woman-buffer-alist))))= )
=C2=A0 (if bu= ffer
- =C2=A0 = =C2=A0(display-buffer buffer)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(progn
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0(display-buffer buffer)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(switch-to-buffer buffer))
=C2=A0 =C2=A0;; Delete alist element:
= =C2=A0 =C2=A0(setq woman= -buffer-alist (cdr woman-buffer-alist))
=C2=A0 =C2=A0nil))
=C2=A0 =C2=A0 =C2=A0= (let* ((prev-ptr (nthcdr (1- woman-buffer-number) woman-buffer-alist))
=C2=A0 =C2=A0 (buf= fer (get-buffer (cdr (car (cdr prev-ptr))))))
=C2=A0 =C2=A0 =C2= =A0 =C2=A0(if buffer
-= =C2=A0(display-buffer buffer)
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(progn
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(disp= lay-buffer buffer)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sw= itch-to-buffer buffer))
=C2=A0 ;; Delete alist element:
=C2=A0 (setcdr prev-ptr (cdr (cdr prev-ptr)))
=C2=A0 (if (>= =3D woman-buffer-number (length woman-buffer-alist))
=C2=A0 =C2=A0 =C2=A0(setq woman-buff= er-number 0))
=C2=A0 <= /span>nil))))
-
=C2=A0=0C
=C2=A0;;; Syntax an= d display tables:
=C2=A0
--=C2=A0
2.6.0.rc0.2= 4.gec371ff



--001a113b19caaa1b440528e94f2d--