2 files changed, 14 insertions, 6 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dc3d28ec44d..4e172cc8064 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,4 +1,9 @@
-2010-07-13  Thierry Volpiatto <thierry.volpiatto@gmail.com>
+2010-07-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-bookmark-make-record): Make it work for
+        Emacs 23 as well.
+
+2010-07-13  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
         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  <kfogel@red-bean.com>
 
-        * 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  <mah@everybody.org>
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 0d3559227b6..ae29c17ae18 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -12645,7 +12645,10 @@ If ALL is a number, fetch this number of articles."
            (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)))))