summaryrefslogtreecommitdiff
path: root/lisp/info.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-03-08 22:07:23 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-03-08 22:07:23 +0000
commit02a5ba27b755b4918f563f81ff0734bb894abadf (patch)
treec1769f48afb648f44c0090b0aed5a4e6627300c4 /lisp/info.el
parent67a9fd0dd7ad2ee053b4c4b54896c1475334bc52 (diff)
downloademacs-02a5ba27b755b4918f563f81ff0734bb894abadf.tar.gz
* bookmark.el (bookmark-prop-get, bookmark-prop-set): New funs.
(bookmark-get-annotation, bookmark-set-annotation) (bookmark-get-filename, bookmark-set-filename, bookmark-get-position) (bookmark-set-position, bookmark-get-front-context-string) (bookmark-set-front-context-string, bookmark-get-rear-context-string) (bookmark-set-rear-context-string, bookmark-get-handler): Use them. * info.el (Info-bookmark-make-record): Don't bother recording point. (bookmark-get-filename, bookmark-get-front-context-string) (bookmark-get-rear-context-string, bookmark-get-position): Don't declare. (bookmark-get-info-node): Remove. (bookmark-prop-get): Declare. (Info-bookmark-jump): Use it.
Diffstat (limited to 'lisp/info.el')
-rw-r--r--lisp/info.el19
1 files changed, 5 insertions, 14 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 893fbfd8f0e..2c8eee9da47 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4351,7 +4351,6 @@ When FILE is non-nil, return the Info file instead."
(point)
(- (point) bookmark-search-size))
nil))
- (position . ,(point))
(info-node . ,Info-current-node)
(handler . Info-bookmark-jump))))
@@ -4368,27 +4367,19 @@ When FILE is non-nil, return the Info file instead."
(defvar bookmark-current-bookmark)
-(declare-function bookmark-get-filename "bookmark" (bookmark))
-(declare-function bookmark-get-front-context-string "bookmark" (bookmark))
-(declare-function bookmark-get-rear-context-string "bookmark" (bookmark))
-(declare-function bookmark-get-position "bookmark" (bookmark))
+(declare-function bookmark-prop-get "bookmark" (bookmark prop))
(declare-function bookmark-file-or-variation-thereof "bookmark" (file))
(declare-function bookmark-jump-noselect "bookmark" (str))
(declare-function bookmark-get-bookmark-record "bookmark" (bookmark))
-(defun bookmark-get-info-node (bookmark)
- "Get the info node associated with BOOKMARK."
- (cdr (assq 'info-node (bookmark-get-bookmark-record bookmark))))
-
;;;###autoload
(defun Info-bookmark-jump (bmk)
;; This implements the `handler' function interface for record type returned
;; by `Info-bookmark-make-record', which see.
- (let* ((file (expand-file-name (bookmark-get-filename bmk)))
- (forward-str (bookmark-get-front-context-string bmk))
- (behind-str (bookmark-get-rear-context-string bmk))
- (place (bookmark-get-position bmk))
- (info-node (bookmark-get-info-node bmk)))
+ (let* ((file (expand-file-name (bookmark-prop-get bmk 'filename)))
+ (forward-str (bookmark-prop-get bmk 'front-context-string))
+ (behind-str (bookmark-prop-get bmk 'rear-context-string))
+ (info-node (bookmark-prop-get bmk 'info-node)))
(if (setq file (bookmark-file-or-variation-thereof file))
(save-excursion
(save-window-excursion