From e0385bf41a6e719c988e3bf07eacb45f02a65287 Mon Sep 17 00:00:00 2001 From: Karl Fogel Date: Fri, 7 Mar 2008 05:44:37 +0000 Subject: Change a return type, for greater extensibility. See http://lists.gnu.org/archive/html/emacs-devel/2007-12/msg01077.html and its thread for discussion leading to this change. * emacs-cvs/lisp/bookmark.el: (bookmark-jump-noselect): Return an alist instead of a dotted pair. (bookmark-jump, bookmark-jump-other-window, bookmark-insert) (bookmark-bmenu-2-window, bookmark-bmenu-other-window) (bookmark-bmenu-switch-other-window): Adjust accordingly. (bookmark-make-cell-function): Adjust documentation accordingly. * emacs-cvs/lisp/image-mode.el (image-bookmark-jump): Adjust return type accordingly; document. * emacs-cvs/lisp/doc-view.el (doc-view-bookmark-jump): Adjust return type accordingly; document. --- lisp/info.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lisp/info.el') diff --git a/lisp/info.el b/lisp/info.el index d85c0df8b17..4fc63035dc6 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -3374,7 +3374,7 @@ With a zero prefix arg, put the name inside a function call to `info'." (put 'Info-mode 'no-clone-indirect t) (defvar tool-bar-map) -(defvar bookmark-make-cell-function) +(defvar bookmark-make-record-function) ;; Autoload cookie needed by desktop.el ;;;###autoload @@ -3487,8 +3487,8 @@ Advanced commands: (set (make-local-variable 'revert-buffer-function) 'Info-revert-buffer-function) (Info-set-mode-line) - (set (make-local-variable 'bookmark-make-cell-function) - 'Info-bookmark-make-cell) + (set (make-local-variable 'bookmark-make-record-function) + 'Info-bookmark-make-record) (run-mode-hooks 'Info-mode-hook)) ;; When an Info buffer is killed, make sure the associated tags buffer @@ -4326,7 +4326,7 @@ BUFFER is the buffer speedbar is requesting buttons for." ;; This is only called from bookmark.el. (declare-function bookmark-buffer-file-name "bookmark" ()) -(defun Info-bookmark-make-cell (annotation &rest args) +(defun Info-bookmark-make-record (annotation &rest args) (let ((the-record `((filename . ,(bookmark-buffer-file-name)) (front-context-string @@ -4368,7 +4368,7 @@ BUFFER is the buffer speedbar is requesting buttons for." ;;;###autoload (defun Info-bookmark-jump (bmk) ;; This implements the `handler' function interface for record type returned - ;; by `Info-make-cell-function', which see. + ;; 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)) -- cgit v1.2.1