From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Boruch Baum Newsgroups: gmane.emacs.bugs Subject: bug#20150: 24.4: bookmarks: return from editing annotations (FIX INCLUDED) Date: Fri, 20 Mar 2015 12:22:31 -0400 Message-ID: <550C4947.9080900@gmx.com> References: <550BCB14.90005@gmx.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HweGtk4LCJuwtKMx2Tl5qFpVMWP3Vc6Ro" X-Trace: ger.gmane.org 1426868673 4257 80.91.229.3 (20 Mar 2015 16:24:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Mar 2015 16:24:33 +0000 (UTC) Cc: 20150@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 20 17:24:16 2015 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 1YYziU-0005wP-Sm for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 17:24:11 +0100 Original-Received: from localhost ([::1]:44706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYziU-00063X-6q for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 12:24:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYziQ-00063A-Le for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 12:24:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYziM-0004L6-E5 for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 12:24:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYziM-0004L2-BF for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 12:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YYziM-0001hE-4j for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 12:24:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Boruch Baum Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 20 Mar 2015 16:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20150 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20150-submit@debbugs.gnu.org id=B20150.14268685936451 (code B ref 20150); Fri, 20 Mar 2015 16:24:02 +0000 Original-Received: (at 20150) by debbugs.gnu.org; 20 Mar 2015 16:23:13 +0000 Original-Received: from localhost ([127.0.0.1]:59307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYzhY-0001fz-Jy for submit@debbugs.gnu.org; Fri, 20 Mar 2015 12:23:12 -0400 Original-Received: from mout.gmx.net ([212.227.15.18]:58222) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYzhV-0001fi-Iz for 20150@debbugs.gnu.org; Fri, 20 Mar 2015 12:23:10 -0400 Original-Received: from [192.168.1.12] ([96.232.130.59]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0M8m7Q-1YeWXA3SSC-00CAy7; Fri, 20 Mar 2015 17:23:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0 In-Reply-To: OpenPGP: url=hkp://keys.gnupg.net X-Provags-ID: V03:K0:3sPVfkxGUSmGbEzHQTTFVfaO/DJ2KQ5hg2O6ybzE65I09yUPmXP jPBev6hyYrv1L1ACtthfWAsh3erFV/eQdDsuQKIcpmlBT6N47Ke7JxzysovNIR1mREfQzTZ /gC4dJSTVyuE3WJxQT9lqLVws5o3EbqY2iIQMqwk8iaREmX2F1/1Cy7Ezk+5HAqP+HNfW1o E/joZ1/TNmnxsCLKfNoxQ== X-UI-Out-Filterresults: notjunk:1; X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.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:100710 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HweGtk4LCJuwtKMx2Tl5qFpVMWP3Vc6Ro Content-Type: multipart/mixed; boundary="------------070900000908030204040407" This is a multi-part message in MIME format. --------------070900000908030204040407 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Pleasure. On 03/20/2015 10:28 AM, Stefan Monnier wrote: >> The fix restores focus to the bmenu-list window, and restores point to= >> where it had been prior to editing the annotation. >=20 > Could you send it as a patch, otherwise I can't really see what's diffe= rent. >=20 >=20 > Stefan >=20 --=20 hkp://keys.gnupg.net CA45 09B5 5351 7C11 A9D1 7286 0036 9E45 1595 8BC0 --------------070900000908030204040407 Content-Type: text/x-patch; name="emacs_bug_20150.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="emacs_bug_20150.patch" --- bookmark.el 2015-03-20 12:08:33.477496667 -0400 +++ bookmark-new.el 2015-03-20 12:09:49.401494206 -0400 @@ -889,13 +889,24 @@ (bookmark-kill-line t) (forward-line 1))) ;; Take no chances with text properties. - (let ((annotation (buffer-substring-no-properties (point-min) (point-m= ax))) - (bookmark-name bookmark-annotation-name)) + (let + ((annotation (buffer-substring-no-properties (point-min) (point-max)= )) + (bookmark-name bookmark-annotation-name) + (return-line + (with-current-buffer "*Bookmark List*" + (line-number-at-pos))) + (return-column + (with-current-buffer "*Bookmark List*" + (current-column)))) (bookmark-set-annotation bookmark-name annotation) (setq bookmark-alist-modification-count (1+ bookmark-alist-modification-count)) - (bookmark-bmenu-surreptitiously-rebuild-list)) - (kill-buffer (current-buffer))) + (kill-buffer (current-buffer)) + (pop-to-buffer (get-buffer "*Bookmark List*")) + (bookmark-bmenu-list) + (goto-char (point-min)) + (forward-line (1- return-line)) + (forward-char return-column))) =20 =20 (defun bookmark-edit-annotation (bookmark-name-or-record) --------------070900000908030204040407-- --HweGtk4LCJuwtKMx2Tl5qFpVMWP3Vc6Ro Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVDElHAAoJEDvrUfDmCx9LqZgP/3bXOL0nVwKKDsZVTtjwp9fW rxHVW6j9MX4XU+aSaDSdLnJHZ7dYnmp0GwHhrmjl0ciBh071N7PHikee3WTusl5c w9SJ0ZfC/Y4QB1ccjaWXDv5a3QX8j2GFBuaapvYagmeXDIF+Jn6BLIWxuR52IbTE Pi35D1hCrI/WcKdTJkQ67eT/OFZtjvPedwGxCB2Y82o28gXLNQ5JLMwbZ/fHeKwe Hfy5eyjL1WZihbg6yXUdZGF5HTrqZ51KuHImWWYNzppoNfUs/le6VVsX3LmLykt8 xscTkusRz31mxtChj4X5AfioOyfBueme0nLSKCBM+OYFu7R9P3fP29qtIq5nxiKw 1coqQmTXzbVYMyLQMNdJa9dDuO0HoJBLhYcXzC3ZwZqUIyu7EjCI5LLvY7wsauWI UeexsOwCLewiptCQlTCDeLyBGcbYS/mVje4Ez3F0Ad25c/ZTpCS7Dw4Etcdpndnq jvhToMrET11g3FTmFGRnQ8FOBh3EjIY/Jkqr44uVU4LsbJtV457xgFlZMXK5MSfc /k64vBmoEIggygOu+nJfj8iCphYlRi38bnqXc9rIVl7n4Xlml5PSNbWqjSWFv0Ah NN9hRgSVEDX1X0Y2JqaOBHrD6s756FI+da9RxvgEuWQKYjrCjc/iHaVZsQU02oSz zFHuDdvwmM/MPr6ehhyv =KIzS -----END PGP SIGNATURE----- --HweGtk4LCJuwtKMx2Tl5qFpVMWP3Vc6Ro--