diff options
| author | Karl Fogel <kfogel@red-bean.com> | 2008-03-07 05:44:37 +0000 |
|---|---|---|
| committer | Karl Fogel <kfogel@red-bean.com> | 2008-03-07 05:44:37 +0000 |
| commit | e0385bf41a6e719c988e3bf07eacb45f02a65287 (patch) | |
| tree | 7a6b75d193ea692481e1567bdec82b1102ad7592 /lisp/image-mode.el | |
| parent | 360bc6282cca18f01c04205c7dbcedd1d679ef3b (diff) | |
| download | emacs-e0385bf41a6e719c988e3bf07eacb45f02a65287.tar.gz | |
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.
Diffstat (limited to 'lisp/image-mode.el')
| -rw-r--r-- | lisp/image-mode.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 23d9aff737d..9a78cb28407 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -278,7 +278,7 @@ This variable is used to display the current image type in the mode line.") map) "Major mode keymap for viewing images as text in Image mode.") -(defvar bookmark-make-cell-function) +(defvar bookmark-make-record-function) ;;;###autoload (defun image-mode () @@ -290,8 +290,8 @@ to toggle between display as an image and display as text." (setq mode-name "Image[text]") (setq major-mode 'image-mode) ;; Use our own bookmarking function for images. - (set (make-local-variable 'bookmark-make-cell-function) - 'image-bookmark-make-cell) + (set (make-local-variable 'bookmark-make-record-function) + 'image-bookmark-make-record) ;; Keep track of [vh]scroll when switching buffers (image-mode-setup-winprops) @@ -431,7 +431,7 @@ and showing the image as an image." ;;; Support for bookmark.el -(defun image-bookmark-make-cell (annotation &rest args) +(defun image-bookmark-make-record (annotation &rest args) (let ((the-record `((filename . ,(buffer-file-name)) (image-type . ,image-type) @@ -454,7 +454,7 @@ and showing the image as an image." ;;;###autoload (defun image-bookmark-jump (bmk) ;; This implements the `handler' function interface for record type - ;; returned by `bookmark-make-cell-function', which see. + ;; returned by `bookmark-make-record-function', which see. (save-window-excursion (let ((filename (bookmark-get-filename bmk)) (type (cdr (assq 'image-type (bookmark-get-bookmark-record bmk)))) |