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 03:24:04 -0400 Message-ID: <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="GJXWfnC3gabvPQWof5UOMliMwwFp8mhEn" X-Trace: ger.gmane.org 1426836389 18886 80.91.229.3 (20 Mar 2015 07:26:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Mar 2015 07:26:29 +0000 (UTC) To: 20150@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 20 08:26:17 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 1YYrJr-0005sW-Ip for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 08:26:11 +0100 Original-Received: from localhost ([::1]:42636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYrJq-0001NV-So for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 03:26:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYrJm-0001Lk-Uv for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 03:26:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYrJi-0000SQ-TT for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 03:26:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:40764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYrJi-0000SL-Q1 for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 03:26:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YYrJi-0004J7-ED for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 03:26: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 07:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20150 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.142683630216477 (code B ref -1); Fri, 20 Mar 2015 07:26:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Mar 2015 07:25:02 +0000 Original-Received: from localhost ([127.0.0.1]:58773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYrIj-0004HM-JS for submit@debbugs.gnu.org; Fri, 20 Mar 2015 03:25:02 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60009) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYrIh-0004H4-7F for submit@debbugs.gnu.org; Fri, 20 Mar 2015 03:24:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYrIa-0008Ef-QP for submit@debbugs.gnu.org; Fri, 20 Mar 2015 03:24:53 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:41850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYrIa-0008Eb-NK for submit@debbugs.gnu.org; Fri, 20 Mar 2015 03:24:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYrIZ-0000yn-BE for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 03:24:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYrIU-0008DV-9t for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 03:24:51 -0400 Original-Received: from mout.gmx.net ([212.227.17.20]:52714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYrIT-0008DQ-VE for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 03:24:46 -0400 Original-Received: from [192.168.1.12] ([96.232.130.59]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0MB1C4-1YinRn409M-009v1W for ; Fri, 20 Mar 2015 08:24:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0 OpenPGP: url=hkp://keys.gnupg.net X-Provags-ID: V03:K0:tMuu2qg/XTYq/aW5513MmQwXdn2LP6J083bPsbb9l2dx+1ntxcR 47gsLIfymCB+Hp+OS4zkX8j9hqtoa/+zaOe1IFfMCOFrzFXC7qYzXJb/rkLjFBSg1RS7MDm 2cCA9ud9q/IfphE+FVo8ABEaXweszAGqLhSTt80G38uGAnbzi116X1w9sFBXEpUf9mF0lHE Jxc9Nw4Y3HnQT6eywWDWw== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:100683 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --GJXWfnC3gabvPQWof5UOMliMwwFp8mhEn Content-Type: multipart/mixed; boundary="------------060009040803040808050707" This is a multi-part message in MIME format. --------------060009040803040808050707 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable When completing a bookmark annotation edit, the point on the bmenu-list would move to point-max and the selected window would be wherever the annotation buffer had been displayed. The fix restores focus to the bmenu-list window, and restores point to where it had been prior to editing the annotation. (defun bookmark-send-edited-annotation () "Use buffer contents as annotation for a bookmark. Lines beginning with `#' are ignored." (interactive) (if (not (derived-mode-p 'bookmark-edit-annotation-mode)) (error "Not in bookmark-edit-annotation-mode")) (goto-char (point-min)) (while (< (point) (point-max)) (if (looking-at "^#") (bookmark-kill-line t) (forward-line 1))) ;; Take no chances with text properties. (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)) (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 hkp://keys.gnupg.net CA45 09B5 5351 7C11 A9D1 7286 0036 9E45 1595 8BC0 --------------060009040803040808050707 Content-Type: text/plain; charset=UTF-8; name="attachment" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment" KGRlZnVuIGJvb2ttYXJrLXNlbmQtZWRpdGVkLWFubm90YXRpb24gKCkKICAiVXNlIGJ1ZmZl ciBjb250ZW50cyBhcyBhbm5vdGF0aW9uIGZvciBhIGJvb2ttYXJrLgpMaW5lcyBiZWdpbm5p bmcgd2l0aCBgIycgYXJlIGlnbm9yZWQuIgogIChpbnRlcmFjdGl2ZSkKICAoaWYgKG5vdCAo ZGVyaXZlZC1tb2RlLXAgJ2Jvb2ttYXJrLWVkaXQtYW5ub3RhdGlvbi1tb2RlKSkKICAgICAg KGVycm9yICJOb3QgaW4gYm9va21hcmstZWRpdC1hbm5vdGF0aW9uLW1vZGUiKSkKICAoZ290 by1jaGFyIChwb2ludC1taW4pKQogICh3aGlsZSAoPCAocG9pbnQpIChwb2ludC1tYXgpKQog ICAgKGlmIChsb29raW5nLWF0ICJeIyIpCiAgICAgICAgKGJvb2ttYXJrLWtpbGwtbGluZSB0 KQogICAgICAoZm9yd2FyZC1saW5lIDEpKSkKICA7OyBUYWtlIG5vIGNoYW5jZXMgd2l0aCB0 ZXh0IHByb3BlcnRpZXMuCiAgKGxldAogICAgKChhbm5vdGF0aW9uIChidWZmZXItc3Vic3Ry aW5nLW5vLXByb3BlcnRpZXMgKHBvaW50LW1pbikgKHBvaW50LW1heCkpKQoJIChib29rbWFy ay1uYW1lIGJvb2ttYXJrLWFubm90YXRpb24tbmFtZSkKICAgICAocmV0dXJuLWxpbmUKICAg ICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyICIqQm9va21hcmsgTGlzdCoiCiAgICAgICAgIChs aW5lLW51bWJlci1hdC1wb3MpKSkKICAgICAocmV0dXJuLWNvbHVtbgogICAgICAgKHdpdGgt Y3VycmVudC1idWZmZXIgIipCb29rbWFyayBMaXN0KiIKICAgICAgICAgKGN1cnJlbnQtY29s dW1uKSkpKQogICAgKGJvb2ttYXJrLXNldC1hbm5vdGF0aW9uIGJvb2ttYXJrLW5hbWUgYW5u b3RhdGlvbikKICAgIChzZXRxIGJvb2ttYXJrLWFsaXN0LW1vZGlmaWNhdGlvbi1jb3VudAog ICAgICAgICAgKDErIGJvb2ttYXJrLWFsaXN0LW1vZGlmaWNhdGlvbi1jb3VudCkpCiAgICAo a2lsbC1idWZmZXIgKGN1cnJlbnQtYnVmZmVyKSkKICAgIChwb3AtdG8tYnVmZmVyIChnZXQt YnVmZmVyICIqQm9va21hcmsgTGlzdCoiKSkKICAgIChib29rbWFyay1ibWVudS1saXN0KQog ICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKICAgIChmb3J3YXJkLWxpbmUgKDEtIHJldHVy bi1saW5lKSkKICAgIChmb3J3YXJkLWNoYXIgcmV0dXJuLWNvbHVtbikpKQo= --------------060009040803040808050707-- --GJXWfnC3gabvPQWof5UOMliMwwFp8mhEn 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 iQIcBAEBAgAGBQJVC8sUAAoJEDvrUfDmCx9LQL8P/iI40MCcGx/AyII718spCsEM 5w4UjYJbyeGch1L7roMHHcmssnhldkwJ3e7DLOL0vgUrSy0bEcH28IXMOnBOgaeQ 52rNDBq/GH0IPX6LtGg3uYNaKWIXN409DJETwKe695DRQfKe9o0L/acMk583QFsT C3FSHnA+FvThUa/sz8R82v4PCLMPRHinR/lkpTy56146jdDIyd4Y+8Veji47+lLC QanMKoYUO1EHZlXmk1MNFo393HwuRHqu4NqnNPLo0gQiSg8eUSSckLk0uQhoDU0B hgBaWUKLc3pqr+WGPaqi4jA1HJNICwEn15rNOHGV439RaSgWVq8X3lxWl0X+FBAp nS95SLbQEkEbBOITia3yxLAAKKJLjVvAHO/0nuvU/BL40SHUoswwt8VBz7P1eaRJ iG58d/8GZ5VhejWD7oJUZ0t1zCi1d6vPvWOmNfclQwSTl/9Uq9ciqVx+ICDo6e6M Rt7vrZGs6T7Y6Fc9NLlLoRSg9ZKzzLgngasTsxIHjyO099HSqripj2uN+ezaUfIP atk3ypCnt0ZHfD5Qd6FX1BhOXmOAY6p6epKFh7g9JengzAnMwjKlqOkc34qsDVm6 HnQJC2AfdtVLOP6hRy9kgdZTe5nRpe1VFaKB5/cNDIXAszAZaLBWieMHZKktW1wQ vk4/l7oKRmeMYMwNEL19 =IxbK -----END PGP SIGNATURE----- --GJXWfnC3gabvPQWof5UOMliMwwFp8mhEn--