From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.bugs Subject: bug#6444: Patch applied. Date: Tue, 13 Jul 2010 18:10:16 -0400 Message-ID: <87630jdody.fsf@red-bean.com> References: <87iq5inqfc.fsf@tux.homenetwork> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1279060233 8845 80.91.229.12 (13 Jul 2010 22:30:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 13 Jul 2010 22:30:33 +0000 (UTC) Cc: Thierry Volpiatto To: 6444-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 14 00:30:31 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OYnzi-0005fH-BG for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Jul 2010 00:30:30 +0200 Original-Received: from localhost ([127.0.0.1]:54188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYnzh-0002wp-Mu for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Jul 2010 18:30:29 -0400 Original-Received: from [140.186.70.92] (port=60313 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYnza-0002ur-V4 for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2010 18:30:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYnzY-0002pc-Vl for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2010 18:30:22 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35432) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYnzY-0002pW-T2 for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2010 18:30:20 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1OYngs-0006e4-C9 for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2010 18:11:02 -0400 In-Reply-To: <87iq5inqfc.fsf@tux.homenetwork> Resent-From: Karl Fogel Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Jul 2010 22:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 6444 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 6444@debbugs.gnu.org, kfogel@red-bean.com Original-Received: via spool by 6444-done@debbugs.gnu.org id=D6444.127905901325419 (code D ref 6444); Tue, 13 Jul 2010 22:11:02 +0000 Original-Received: (at 6444-done) by debbugs.gnu.org; 13 Jul 2010 22:10:13 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYng5-0006bu-CP for submit@debbugs.gnu.org; Tue, 13 Jul 2010 18:10:13 -0400 Original-Received: from osh-net-219-98.onshore.net ([66.146.219.98] helo=sanpietro.red-bean.com) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYng3-0006bb-7b for 6444-done@debbugs.gnu.org; Tue, 13 Jul 2010 18:10:11 -0400 Original-Received: from localhost ([127.0.0.1]:57019 helo=floss ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.72) (envelope-from ) id 1OYng9-0005Qs-BB; Tue, 13 Jul 2010 17:10:17 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Tue, 13 Jul 2010 18:11:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:38496 Archived-At: I applied the patch. I didn't include the `if' -> `when' change in this commit, because it's extraneous to the functional change. I'll commit that improvement separately, afterwards. Thanks! $ bzr ci -F log-message.txt Committing to: sftp://kfogel@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/ modified lisp/ChangeLog modified lisp/bookmark.el Committed revision 100812. $ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-13 17:02:27 +0000 +++ lisp/ChangeLog 2010-07-13 22:09:07 +0000 @@ -1,3 +1,9 @@ +2010-07-13 Karl Fogel + + * bookmark.el (bookmark-show-annotation): Ensure annotations show, + e.g. in Info bookmarks, by using `switch-to-buffer-other-window'. + Patch by Thierry Volpiatto (Bug#6444). + 2010-07-13 Chong Yidong * frame.el (make-frame): Fix typo in 2010-06-30 change (Bug#6625). === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2010-07-10 18:52:53 +0000 +++ lisp/bookmark.el 2010-07-13 22:05:39 +0000 @@ -1741,7 +1741,7 @@ ;; (insert (concat "Annotation for bookmark '" bookmark "':\n\n")) (insert annotation) (goto-char (point-min)) - (pop-to-buffer old-buf)))))) + (switch-to-buffer-other-window old-buf)))))) (defun bookmark-show-all-annotations ()