* lisp/bookmark.el (bookmark-jump): Add new `display-func' parameter.

  (bookmark-jump-other-window): Just invoke bookmark-jump with new
  argument now, so the two function's behaviors will match.  (Bug#3645)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1b1100a389a9626abe80dc3d684af0d8740fc50..b2cdead363490baa31d20a12d807f24eba1ac5b6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-09  Karl Fogel  <kfogel@red-bean.com>
+
+       * bookmark.el (bookmark-jump): Add new `display-func' parameter.
+       (bookmark-jump-other-window): Just invoke bookmark-jump with new
+       argument now, so the two function's behaviors will match.  (Bug#3645)
+
 2009-10-08  Chong Yidong  <cyd@stupidchicken.com>
 
        * cedet/ede/proj.el (project-make-dist, project-compile-project):

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b59a06970bc1602ab5023fecc8411e334797aaa6..300e8b8e2c85da82d75ce9301748f34fcf2ff6d9 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -989,7 +989,7 @@ any annotations for this bookmark."
 
 
 ;;;###autoload
-(defun bookmark-jump (bookmark)
+(defun bookmark-jump (bookmark &optional display-func)
   "Jump to bookmark BOOKMARK (a point in some file).
 You may have a problem using this function if the value of variable
 `bookmark-alist' is nil.  If that happens, you need to load in some
@@ -1002,27 +1002,27 @@ will then jump to the new location, as well as recording it in place
 of the old one in the permanent bookmark record.
 
 BOOKMARK may be a bookmark name (a string) or a bookmark record, but
-the latter is usually only used by programmatic callers."
+the latter is usually only used by programmatic callers.
+
+If DISPLAY-FUNC is non-nil, it is a function to invoke to display the
+bookmark.  It defaults to `switch-to-buffer'; a typical other value
+would be, e.g., `switch-to-buffer-other-window'."
   (interactive
    (list (bookmark-completing-read "Jump to bookmark"
                                   bookmark-current-bookmark)))
   (unless bookmark
     (error "No bookmark specified"))
   (bookmark-maybe-historicize-string bookmark)
-  (bookmark--jump-via bookmark 'switch-to-buffer))
+  (bookmark--jump-via bookmark (or display-func 'switch-to-buffer)))
 
 
 ;;;###autoload
 (defun bookmark-jump-other-window (bookmark)
   "Jump to BOOKMARK in another window.  See `bookmark-jump' for more."
   (interactive
-   (let ((bkm (bookmark-completing-read "Jump to bookmark (in another window)"
-                                        bookmark-current-bookmark)))
-     (if (> emacs-major-version 21)
-         (list bkm) bkm)))
-  (when bookmark
-    (bookmark-maybe-historicize-string bookmark)
-    (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
+   (list (bookmark-completing-read "Jump to bookmark (in another window)"
+                                   bookmark-current-bookmark)))
+  (bookmark-jump bookmark 'switch-to-buffer-other-window))
 
 
 (defun bookmark-jump-noselect (bookmark)