[Emacs-diffs] /srv/bzr/emacs/trunk r100824: Make gnus-summary-bookmark-make-record work for Emacs 23 as well.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 100824 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-15 00:56:13 +0000
message:
  Make gnus-summary-bookmark-make-record work for Emacs 23 as well.
  
  2010-07-15  Katsumi Yamaoka  <address@hidden>
   * gnus-sum.el (gnus-summary-bookmark-make-record): Make it work for
   Emacs 23 as well.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-07-14 16:41:40 +0000
+++ b/lisp/gnus/ChangeLog       2010-07-15 00:54:06 +0000
@@ -1,4 +1,9 @@
-2010-07-13  Thierry Volpiatto <address@hidden>
+2010-07-15  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-sum.el (gnus-summary-bookmark-make-record): Make it work for
+       Emacs 23 as well.
+
+2010-07-13  Thierry Volpiatto  <address@hidden>
 
        Allow C-w when setting a bookmark in a Gnus Article buffer (Bug#5975).
        Patch applied by Karl Fogel.
@@ -15,14 +20,14 @@
 
        * gnus-art.el (bookmark-make-record-function): New local variable.
 
-       * gnus-sum.el (gnus-summary-bookmark-make-record): Allow setting
-       from article buffer.
+       * 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  <address@hidden>
 
-       * gnus/gnus-sum.el (bookmark-make-record-default): Adjust
-       declaration, based on changes in bookmark.el.
+       * gnus-sum.el (bookmark-make-record-default): Adjust declaration, based
+       on changes in bookmark.el.
 
 2010-06-22  Mark A. Hershberger  <address@hidden>
 

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2010-07-14 16:41:40 +0000
+++ b/lisp/gnus/gnus-sum.el     2010-07-15 00:54:06 +0000
@@ -12645,7 +12645,10 @@
            (head    (gnus-summary-article-header art))
            (id      (mail-header-id head)))
       `(,subject
-        ,@(bookmark-make-record-default 'no-file 'no-context pos)
+       ,@(condition-case nil
+             (bookmark-make-record-default 'no-file 'no-context (point))
+           (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)))))