aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/help-mode.el
diff options
context:
space:
mode:
authorDrew Adams2012-06-13 08:36:29 -0400
committerStefan Monnier2012-06-13 08:36:29 -0400
commit87e6e64f99de751c4459eb7acc6ac31e20db1f25 (patch)
tree1e1acbd1b6c5f28c76505bfd24e23bc7a6de470f /lisp/help-mode.el
parent682cefaf0c2f61d8d83c3628ae3b0da880771dcf (diff)
downloademacs-87e6e64f99de751c4459eb7acc6ac31e20db1f25.tar.gz
emacs-87e6e64f99de751c4459eb7acc6ac31e20db1f25.zip
* lisp/help-mode.el (help-bookmark-make-record, help-bookmark-jump):
Fix last change.
Diffstat (limited to 'lisp/help-mode.el')
-rw-r--r--lisp/help-mode.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 88b5e095cf6..85c1e62e2c3 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -808,9 +808,8 @@ Implements `bookmark-make-record-function' for help-mode buffers."
808 (unless (car help-xref-stack-item) 808 (unless (car help-xref-stack-item)
809 (error "Cannot create bookmark - help command not known")) 809 (error "Cannot create bookmark - help command not known"))
810 `(,@(bookmark-make-record-default 'NO-FILE 'NO-CONTEXT) 810 `(,@(bookmark-make-record-default 'NO-FILE 'NO-CONTEXT)
811 (buffer-name . "*Help*")
812 (help-fn . ,(car help-xref-stack-item)) 811 (help-fn . ,(car help-xref-stack-item))
813 (help-arg . ,(cadr help-xref-stack-item)) 812 (help-args . ,(cdr help-xref-stack-item))
814 (position . ,(point)) 813 (position . ,(point))
815 (handler . help-bookmark-jump))) 814 (handler . help-bookmark-jump)))
816 815
@@ -819,10 +818,10 @@ Implements `bookmark-make-record-function' for help-mode buffers."
819 "Jump to help-mode bookmark BOOKMARK. 818 "Jump to help-mode bookmark BOOKMARK.
820Handler function for record returned by `help-bookmark-make-record'. 819Handler function for record returned by `help-bookmark-make-record'.
821BOOKMARK is a bookmark name or a bookmark record." 820BOOKMARK is a bookmark name or a bookmark record."
822 (let ((help-fn (bookmark-prop-get bookmark 'help-fn)) 821 (let ((help-fn (bookmark-prop-get bookmark 'help-fn))
823 (help-arg (bookmark-prop-get bookmark 'help-arg)) 822 (help-args (bookmark-prop-get bookmark 'help-args))
824 (position (bookmark-prop-get bookmark 'position))) 823 (position (bookmark-prop-get bookmark 'position)))
825 (funcall help-fn help-arg) 824 (apply help-fn help-args)
826 (pop-to-buffer "*Help*") 825 (pop-to-buffer "*Help*")
827 (goto-char position))) 826 (goto-char position)))
828 827