From: Karl Fogel <kfogel@red-bean.com>
To: emacs-devel@gnu.org
Cc: 5975@debbugs.gnu.org, Thierry Volpiatto <thierry.volpiatto@gmail.com>
Subject: bug#5975: Base patch for bug #5975 (bookmarking from Gnus Article buffer).
Date: Tue, 13 Jul 2010 17:41:44 -0400 [thread overview]
Message-ID: <87d3urdppj.fsf__42776.2249521495$1279058434$gmane$org@red-bean.com> (raw)
In-Reply-To: <87k4ozdq6b.fsf_-_@red-bean.com> (Karl Fogel's message of "Tue, 13 Jul 2010 17:31:40 -0400")
Karl Fogel <kfogel@red-bean.com> writes:
>Just for reference, the current (preparatory) patch is below. I will
>follow up separately with the gnus/* patch, so it's in the archives.
Here's that patch (still needs the C-w fix referred to in the bug, though).
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog 2010-07-13 21:20:34 +0000
+++ lisp/gnus/ChangeLog 2010-07-13 21:39:19 +0000
@@ -1,5 +1,16 @@
2010-07-13 Karl Fogel <kfogel@red-bean.com>
+ Allow bookmarks to be set from Gnus Article buffers.
+ Based on a patch by Thierry Volpiatto (Bug #5975).
+
+ * gnus-art.el (bookmark-make-record-function): New local variable.
+
+ * gnus-sum.el (gnus-summary-bookmark-make-record): Allow setting
+ from article buffer.
+ (gnus-summary-bookmark-jump): Maybe jump to article buffer.
+
+2010-07-13 Karl Fogel <kfogel@red-bean.com>
+
* gnus/gnus-sum.el (bookmark-make-record-default): Adjust
declaration, based on changes in bookmark.el.
=== modified file 'lisp/gnus/gnus-art.el'
--- lisp/gnus/gnus-art.el 2010-06-10 05:33:55 +0000
+++ lisp/gnus/gnus-art.el 2010-07-13 21:39:19 +0000
@@ -4452,6 +4452,8 @@
(make-local-variable 'gnus-article-image-alist)
(make-local-variable 'gnus-article-charset)
(make-local-variable 'gnus-article-ignored-charsets)
+ (set (make-local-variable 'bookmark-make-record-function)
+ 'gnus-summary-bookmark-make-record)
;; Prevent Emacs 22 from displaying non-break space with `nobreak-space'
;; face.
(set (make-local-variable 'nobreak-char-display) nil)
=== modified file 'lisp/gnus/gnus-sum.el'
--- lisp/gnus/gnus-sum.el 2010-07-13 21:20:34 +0000
+++ lisp/gnus/gnus-sum.el 2010-07-13 21:39:19 +0000
@@ -12629,18 +12629,24 @@
(defun gnus-summary-bookmark-make-record ()
"Make a bookmark entry for a Gnus summary buffer."
- (unless (and (derived-mode-p 'gnus-summary-mode) gnus-article-current)
- (error "Please retry from the Gnus summary buffer")) ;[1]
- (let* ((subject (elt (gnus-summary-article-header) 1))
- (grp (car gnus-article-current))
- (art (cdr gnus-article-current))
- (head (gnus-summary-article-header art))
- (id (mail-header-id head)))
- `(,subject
- ,@(bookmark-make-record-default 'point-only)
- (location . ,(format "Gnus %s:%d:%s" grp art id))
- (group . ,grp) (article . ,art)
- (message-id . ,id) (handler . gnus-summary-bookmark-jump))))
+ (let (pos buf)
+ (unless (and (derived-mode-p 'gnus-summary-mode) gnus-article-current)
+ (save-restriction ; FIXME is it necessary to widen?
+ (widen) (setq pos (point))) ; Set position in gnus-article buffer.
+ (setq buf "art") ; We are recording bookmark from article buffer.
+ (gnus-article-show-summary)) ; Go back in summary buffer.
+ ;; We are now recording bookmark from summary buffer.
+ (unless buf (setq buf "sum"))
+ (let* ((subject (elt (gnus-summary-article-header) 1))
+ (grp (car gnus-article-current))
+ (art (cdr gnus-article-current))
+ (head (gnus-summary-article-header art))
+ (id (mail-header-id head)))
+ `(,subject
+ ,@(bookmark-make-record-default 'no-file 'no-context pos)
+ (location . ,(format "Gnus-%s %s:%d:%s" buf grp art id))
+ (group . ,grp) (article . ,art)
+ (message-id . ,id) (handler . gnus-summary-bookmark-jump)))))
;;;###autoload
(defun gnus-summary-bookmark-jump (bookmark)
@@ -12648,10 +12654,18 @@
BOOKMARK is a bookmark name or a bookmark record."
(let ((group (bookmark-prop-get bookmark 'group))
(article (bookmark-prop-get bookmark 'article))
- (id (bookmark-prop-get bookmark 'message-id)))
+ (id (bookmark-prop-get bookmark 'message-id))
+ (buf (car (split-string (bookmark-prop-get bookmark 'location)))))
(gnus-fetch-group group (list article))
(gnus-summary-insert-cached-articles)
(gnus-summary-goto-article id nil 'force)
+ ;; FIXME we have to wait article buffer is ready (only large buffer)
+ ;; Is there a better solution to know that?
+ ;; If we don't wait `bookmark-default-handler' will have no chance
+ ;; to set position. However there is no error, just wrong pos.
+ (sit-for 1)
+ (when (string= buf "Gnus-art")
+ (other-window 1))
(bookmark-default-handler
`(""
(buffer . ,(current-buffer))
next prev parent reply other threads:[~2010-07-13 21:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87y6dydn6q.fsf@tux.homenetwork>
[not found] ` <201006292126.15409.tassilo@member.fsf.org>
[not found] ` <87iq51ehnv.fsf@tux.homenetwork>
[not found] ` <201006292210.43121.tassilo@member.fsf.org>
[not found] ` <87eifpegqx.fsf@tux.homenetwork>
2010-07-13 21:31 ` bug#5975: Base patch for bug #5975 (bookmarking from Gnus Article buffer) Karl Fogel
[not found] ` <87k4ozdq6b.fsf_-_@red-bean.com>
2010-04-19 17:07 ` bug#5975: 24.0.50; [PATCH]Feature request: bookmarking from gnus article buffer Thierry Volpiatto
2010-05-17 14:14 ` Thierry Volpiatto
2010-07-13 21:46 ` bug#5975: Bazaar branch where this is being fixed Karl Fogel
2010-07-13 23:30 ` bug#5975: Base patch for bug #5975 (bookmarking from Gnus Article buffer) Glenn Morris
2010-07-14 19:48 ` bug#5975: [PATCH] Allow using C-w (bookmark-yank-word) when bookmarking from a gnus article buffer Thierry Volpiatto
2010-07-13 21:41 ` Karl Fogel [this message]
[not found] ` <vi7hkzx8mj.fsf@fencepost.gnu.org>
2010-07-14 0:33 ` bug#5975: Base patch for bug #5975 (bookmarking from Gnus Article buffer) Karl Fogel
2010-07-14 8:55 ` Andreas Schwab
[not found] ` <m3wrsyxx20.fsf@hase.home>
2010-07-14 15:29 ` Karl Fogel
[not found] <87630icytd.fsf@tux.homenetwork>
2010-07-14 16:44 ` bug#5975: [PATCH] Allow using C-w (bookmark-yank-word) when bookmarking from a gnus article buffer Karl Fogel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='87d3urdppj.fsf__42776.2249521495$1279058434$gmane$org@red-bean.com' \
--to=kfogel@red-bean.com \
--cc=5975@debbugs.gnu.org \
--cc=emacs-devel@gnu.org \
--cc=thierry.volpiatto@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).