bug#6656: 24.0.50; Bugfix:gnus-summary-bookmark-make-record

[Thierry Volpiatto <thierry.volpiatto@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 850 bytes --]

Hi,
just fix bug introduced in:

,----
|    commit c20fb917f2a9b0597dc4f9b96d692393802192bf
|    Commit: Katsumi Yamaoka <yamaoka@jpl.org>
|    CommitDate: Thu Jul 15 00:56:13 2010 +0000
| 
|       Make gnus-summary-bookmark-make-record work for Emacs 23 as well.
|       
|       2010-07-15  Katsumi Yamaoka  <yamaoka@jpl.org>
|        * gnus-sum.el (gnus-summary-bookmark-make-record): Make it work for
|        Emacs 23 as well.
`----

(bookmark-make-record-default 'no-file 'no-context pos)==> good
(bookmark-make-record-default 'no-file 'no-context (point))==> bad

When pos is set to (point) value, it is in gnus-art buffer, if you use
(point) directly in bookmark-make-record-default, you use the value of
point in the gnus-sum buffer, what is wrong.


-- 
Thierry Volpiatto
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

[-- Attachment #2: patch-r109443 --]
[-- Type: application/octet-stream, Size: 1785 bytes --]

# HG changeset patch
# User Thierry Volpiatto <thierry.volpiatto@gmail.com>
# Date 1279311776 -7200
# Node ID 13647d3ea66d853a2e1f2b007988dd9a1f5d7a26
# Parent  a872e7559780483b13f18861b4499248db701a5e
* lisp/gnus/gnus-sum.el (gnus-summary-bookmark-make-record) Use pos set in article buffer and not summary buffer.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -12631,8 +12631,8 @@
   "Make a bookmark entry for a Gnus summary buffer."
   (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.
+      (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.
       (setq bookmark-yank-point (point))
       (setq bookmark-current-buffer (current-buffer))
@@ -12645,10 +12645,11 @@
            (head    (gnus-summary-article-header art))
            (id      (mail-header-id head)))
       `(,subject
-	,@(condition-case nil
-	      (bookmark-make-record-default 'no-file 'no-context (point))
-	    (wrong-number-of-arguments
-	     (bookmark-make-record-default 'point-only)))
+        ,@(condition-case
+           nil
+           (bookmark-make-record-default 'no-file 'no-context pos)
+           (wrong-number-of-arguments
+            (bookmark-make-record-default 'point-only)))
         (location . ,(format "Gnus-%s %s:%d:%s" buf grp art id))
         (group . ,grp) (article . ,art)
         (message-id . ,id) (handler . gnus-summary-bookmark-jump)))))