Use buffer's name for help-mode bookmarks (Bug#24573)

* lisp/help-mode.el (help-bookmark-make-record): Replace buffer
objects with their names in help-args, otherwise the bookmark won't be
readable from the bookmark save file.

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index dc2992cd4a5c19d49dc62d2c4b8a955eb480230d..fb29bd2be4fbaeb562b4d43588e9dc3c94d568e9 100644 (file)
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -787,7 +787,9 @@ Implements `bookmark-make-record-function' for help-mode buffers."
     (error "Cannot create bookmark - help command not known"))
   `(,@(bookmark-make-record-default 'NO-FILE 'NO-CONTEXT)
       (help-fn     . ,(car help-xref-stack-item))
-      (help-args   . ,(cdr help-xref-stack-item))
+      (help-args   . ,(mapcar (lambda (a)
+                                (if (bufferp a) (buffer-name a) a))
+                              (cdr help-xref-stack-item)))
       (position    . ,(point))
       (handler     . help-bookmark-jump)))