From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christoph Newsgroups: gmane.emacs.bugs Subject: bug#6515: Patch for bug #6515: unneeded let-bound variables in bookmark.el Date: Sat, 26 Jun 2010 15:45:18 -0600 Message-ID: <4C2674EE.9060706@gmail.com> References: <87lja2rf2n.fsf@tux.homenetwork> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080707020005070900080207" X-Trace: dough.gmane.org 1277597328 8017 80.91.229.12 (27 Jun 2010 00:08:48 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 27 Jun 2010 00:08:48 +0000 (UTC) To: 6515@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jun 27 02:08:46 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 1OSfQS-0004Ib-LW for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Jun 2010 02:08:45 +0200 Original-Received: from localhost ([127.0.0.1]:46539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSfQR-0005JL-98 for geb-bug-gnu-emacs@m.gmane.org; Sat, 26 Jun 2010 20:08:43 -0400 Original-Received: from [140.186.70.92] (port=50079 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSdP8-0002FX-NH for bug-gnu-emacs@gnu.org; Sat, 26 Jun 2010 17:59:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OSdP7-00024d-Dx for bug-gnu-emacs@gnu.org; Sat, 26 Jun 2010 17:59:14 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:56601) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OSdP7-00024Z-BL for bug-gnu-emacs@gnu.org; Sat, 26 Jun 2010 17:59:13 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1OSdDK-0005sp-CG; Sat, 26 Jun 2010 17:47:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87lja2rf2n.fsf@tux.homenetwork> Resent-From: Christoph Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 26 Jun 2010 21:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6515 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 6515-submit@debbugs.gnu.org id=B6515.127758878722609 (code B ref 6515); Sat, 26 Jun 2010 21:47:02 +0000 Original-Received: (at 6515) by debbugs.gnu.org; 26 Jun 2010 21:46:27 +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 1OSdCl-0005sc-7K for submit@debbugs.gnu.org; Sat, 26 Jun 2010 17:46:27 -0400 Original-Received: from mail-gy0-f172.google.com ([209.85.160.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OSdBl-0005rg-Ef for 6515@debbugs.gnu.org; Sat, 26 Jun 2010 17:45:26 -0400 Original-Received: by gyh4 with SMTP id 4so5624618gyh.3 for <6515@debbugs.gnu.org>; Sat, 26 Jun 2010 14:45:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type; bh=Lj9pgqJQWN5RgzPqtn3ycBqojGj+J7hIEIEjgTuCSBI=; b=vkJR0E+lJ2qb0/MoCxfPZzRMUGus33ZvCHNzX+gx2GI/WZVnXjW6IttGQDlgPoaysO +jPB3Ne8gjKX3xFwcH1ui/tbLndhEWq9d8UOGAzQ9kO0XRXjiBUyitJs1klTKUHTfZHX CjwgmPlDf5u2k+B2MMc9ydEZY9EU2W9s6S1Fo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; b=dEDrAiyviBL6Qe/3qtcX8ts08S5Ib2s+a9PQdqK/79CcBf0IR98J4T6at7Gej7faT+ PuXTlbNIZ+xWoMwB7MvYwENzIoruSRPOWrO1DBULwd76abImvQygGTLwh9OAPskGPPD4 YSMEvGOqWHQruEwUkeRf09/LSbhZp/XsGIWr8= Original-Received: by 10.100.81.9 with SMTP id e9mr3503232anb.115.1277588721110; Sat, 26 Jun 2010 14:45:21 -0700 (PDT) Original-Received: from [192.168.1.4] (184-96-96-143.hlrn.qwest.net [184.96.96.143]) by mx.google.com with ESMTPS id f7sm26706561anb.7.2010.06.26.14.45.19 (version=SSLv3 cipher=RC4-MD5); Sat, 26 Jun 2010 14:45:20 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.4) Gecko/20100608 Thunderbird/3.1 X-Mailman-Approved-At: Sat, 26 Jun 2010 17:46:26 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sat, 26 Jun 2010 17:47:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Mailman-Approved-At: Sat, 26 Jun 2010 20:08:39 -0400 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:38037 Archived-At: This is a multi-part message in MIME format. --------------080707020005070900080207 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi Find attached a bugfix for bug #6515 (http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6515) for review. Imho, the bug report is valid. I don't think the code in question should override globally set variable bookmark-automatically-show-annotations. Therefore, the let variables were removed. I sent in my signed paperwork a while ago, but haven't heard anything back, so I hope this is minor enough to maybe go through without it. Christoph --------------080707020005070900080207 Content-Type: text/plain; name="bugfix_6515.txt.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="bugfix_6515.txt.txt" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: cschol2112@gmail.com-20100626175327-syboc05tlvbvcjwg # target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/ # testament_sha1: ed110efd0fe83dca9884a93319ad8d3447b1eb7c # timestamp: 2010-06-26 11:57:42 -0600 # base_revision_id: eliz@gnu.org-20100626144112-032airiym9h9hy1p # # Begin patch === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2010-04-14 15:07:53 +0000 +++ lisp/bookmark.el 2010-06-26 17:53:27 +0000 @@ -1860,8 +1860,7 @@ (pop-up-windows t)) (delete-other-windows) (switch-to-buffer (other-buffer)) - (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed? - (bookmark--jump-via bmrk 'pop-to-buffer)) + (bookmark--jump-via bmrk 'pop-to-buffer) (bury-buffer menu))) @@ -1875,8 +1874,7 @@ "Select this line's bookmark in other window, leaving bookmark menu visible." (interactive) (let ((bookmark (bookmark-bmenu-bookmark))) - (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? - (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))) + (bookmark--jump-via bookmark 'switch-to-buffer-other-window))) (defun bookmark-bmenu-switch-other-window () @@ -1887,8 +1885,7 @@ (pop-up-windows t) same-window-buffer-names same-window-regexps) - (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? - (bookmark--jump-via bookmark 'display-buffer)))) + (bookmark--jump-via bookmark 'display-buffer))) (defun bookmark-bmenu-other-window-with-mouse (event) "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible." # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSskWiYAA1jfgEAQWOf/91oA CgC////wUAXtDzonbDVnKUIBy4SSTRMRMwAU0zQ0EyI0PUzSBJTUyYRkmENTUYQBoZDQ0ASRAg1M UepoAAMgGgADDQ0AAAGgAAAABJICJmppkZMmSbURppPU2oBoGcpryRanH54HQeVlN8CTrJZbdKtZ C5+0UsUkkrRj4MIFJ7SCCwuVMzXSDjsMxs8UviBKTOxVjNo4kHNrEz3Pak7n4PZe/e48VfZmszFh wkcc2A7w5+7q6WIBxQY6J6+yHvckbAyTTbzBj7gvuWC+ScNXkmZVgGJkvAt/La12Q87LcRiow4CJ TIVGZlFB6RUgisUwpjAq9KNOLnO0Z9vORIcN4cj3ZINYqyhwCfpuguG7y7KJ9XhUJqDxOSB84LjG yQoCsSfYSdd/nrUTGttL0q3uRUygm+hIBe2oalnmbivVBBYVhF5IyeqGHHPPXciINPJhMKt0hZNN bnEqERneNjgMqVgGkKGbCowb2Cfu4oHI5oVGuOsea7rlxaC2ElkLpBGIggWaGxJTwurT2SCg4XW0 /8RrAy4CigVvfaS6u6mCzxUq58C+ES6XQ1lJwumsRanJV6SL6EDnRUcnyaxfdgUool3MjaulyJv7 oKc3Qx4FUwnpmYXIxw56HUsJBMWahQe+ul220VLTBMVCN8WGLJCKXPB4CI0snLmUDMrK0pHO5VEG J3RfAbk1KiwpLwK4XmKd+bq8MCfDODJBY3IuIrFILzPgeOz6ZRqYlIbFshwb7Re2WmkDdMNfQVbR hJ6tJ8i+wi9wu2JJ0SitzNju0HiwmIvF7xFq0EcGxxTdhLldAdiOCbiCHLIcUfAusenKenGZIFO2 SwFMUiRs6oxMiaFSThORFy7RTUuxV/vLHKpkGWBfBy0mKajAzHXGYwnjCcESSaARSjIceo8Q7yeo anezNBjf9mbSVEHCta1FbxhhMfXSoYjuYGI6VvZ4e6y2OLogONMYZPM93eYiXSwfpMuvnyMUshBc vnMs8YmJUr7hETgJasb+mCLTIkcYJ7Jxj7X2kVhIRxx6jDqJj+LExGPV+scnVgtwjhSKflxxtKJF bTzLu2Kx3bxB9EovN4USiC0vLxnIYcM77nkFK9KGRhQzmjymLoPIHYR4mL5QKy0s00Lq4Ywk/uiZ QFmUgvPJEnaZaPZqtp1izcnl9lUBLvhPUnJzIMh1BGl16mszmajy4ypY6m16RTlVbjWWxHTkKeqh 9hj0v+48PouqOgmFgs565noc6siBrE6mwPtAhFATU4XQdKNgqdxbtLXhyEwUBwWnmbjqbPg3wBMM x+iR7i4TZ+q6IIIo/kBbDoGCbcB5bIAR9EKoStIVvU4UGk6H2J7h5EcgjpEGAnhTalXpj+MCoeb7 ANCuKgOJLSaOJOoFCpBqleKuFOZAwZJfCRx6iY7iBwDxBwA4DwvTBtI8MDaepFcMjY3vEcShLuJ6 A+ExIQeSR0R5zO5eGhUPKFzKQ8MPZVTA5klOAF8RxoPIfMQ0TYVohxNwrxavFticy0WV4pQ4JHuC HVgiAHuYhNIjqxYWsl9hORB4qWzqx38EYIsSI6DDC/6AdlIJ/rTOo+NROJ7dhDkuSwLoiJG48JCg T+WHY0UebCJoeWdarzqkWKcmE5aiM1DI1EETBMMVMzHAtAYmVMMw9SBxADnEVocRhxyDEkw+ZU2B xk8dsVDwFUwQYoJ3sLE7BML6uzr1B5fo3O0/y0rbLwZYC0FsqCquE3NZgXvoKFsxRF6rH3+qccrB XmjBurBSmuBbBDqjKw/xdyRThQkCskWiYA== --------------080707020005070900080207--