Mercurial > emacs
changeset 96280:bfca3297fa0b
* bookmark.el (bookmark-alist): Allow the 2 slightly different formats
used until now in bookmark.el's code.
(bookmark-get-bookmark): Accept bookmark names or bookmark records.
(bookmark-get-bookmark-record): Allow the 2 slightly different formats
used until now in bookmark.el's code.
(bookmark-set-filename): Remove special code, moved to its only caller.
(bookmark-store): Use the newer format.
(bookmark-make-record-default): Add arg `point-only'.
Rename from bookmark-make-record-for-text-file.
(bookmark--jump-via): New function.
(bookmark-jump, bookmark-jump-other-window, bookmark-bmenu-2-window)
(bookmark-bmenu-other-window, bookmark-bmenu-switch-other-window):
Use it.
(bookmark-jump-noselect, bookmark-default-handler):
Don't return an alist, instead return the data implicitly by changing
current buffer and point. Signal an error if the file doesn't exist.
* info.el (Info-bookmark-make-record):
Use bookmark-make-record-default.
(Info-bookmark-jump): Use bookmark-default-handler.
* image-mode.el (image-bookmark-make-record):
Use bookmark-make-record-default.
(image-bookmark-jump): Use bookmark-default-handler.
* doc-view.el (doc-view-bookmark-make-record):
Use bookmark-make-record-default.
(doc-view-bookmark-jump): Use bookmark-default-handler.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 25 Jun 2008 16:51:33 +0000 |
| parents | 534958847ee0 |
| children | b61f47138fd3 |
| files | etc/NEWS lisp/ChangeLog lisp/bookmark.el lisp/doc-view.el lisp/image-mode.el lisp/info.el |
| diffstat | 6 files changed, 258 insertions(+), 282 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Wed Jun 25 15:46:23 2008 +0000 +++ b/etc/NEWS Wed Jun 25 16:51:33 2008 +0000 @@ -864,6 +864,9 @@ * Lisp Changes in Emacs 23.1 +** bookmark provides `bookmark-make-record-function' so special major modes +like Info can teach bookmark.el how to save&restore the relevant data. + ** The new variable next-error-recenter specifies how next-error should recenter the visited source file. Its value can be a number (for example, 0 for top line, -1 for bottom line), or nil for no recentering.
--- a/lisp/ChangeLog Wed Jun 25 15:46:23 2008 +0000 +++ b/lisp/ChangeLog Wed Jun 25 16:51:33 2008 +0000 @@ -1,5 +1,34 @@ 2008-06-25 Stefan Monnier <monnier@iro.umontreal.ca> + * info.el (Info-bookmark-make-record): + Use bookmark-make-record-default. + (Info-bookmark-jump): Use bookmark-default-handler. + + * image-mode.el (image-bookmark-make-record): + Use bookmark-make-record-default. + (image-bookmark-jump): Use bookmark-default-handler. + + * doc-view.el (doc-view-bookmark-make-record): + Use bookmark-make-record-default. + (doc-view-bookmark-jump): Use bookmark-default-handler. + + * bookmark.el (bookmark-alist): Allow the 2 slightly different formats + used until now in bookmark.el's code. + (bookmark-get-bookmark): Accept bookmark names or bookmark records. + (bookmark-get-bookmark-record): Allow the 2 slightly different formats + used until now in bookmark.el's code. + (bookmark-set-filename): Remove special code, moved to its only caller. + (bookmark-store): Use the newer format. + (bookmark-make-record-default): Add arg `point-only'. + Rename from bookmark-make-record-for-text-file. + (bookmark--jump-via): New function. + (bookmark-jump, bookmark-jump-other-window, bookmark-bmenu-2-window) + (bookmark-bmenu-other-window, bookmark-bmenu-switch-other-window): + Use it. + (bookmark-jump-noselect, bookmark-default-handler): + Don't return an alist, instead return the data implicitly by changing + current buffer and point. Signal an error if the file doesn't exist. + * buff-menu.el: Use with-current-buffer and inhibit-read-only. (Buffer-menu-toggle-read-only): Avoid vc-toggle-read-only.
--- a/lisp/bookmark.el Wed Jun 25 15:46:23 2008 +0000 +++ b/lisp/bookmark.el Wed Jun 25 16:51:33 2008 +0000 @@ -258,16 +258,18 @@ \(BOOKMARK1 BOOKMARK2 ...\) -where each BOOKMARK is typically of the form +where each BOOKMARK is of the form + + (NAME PARAM-ALIST) or (NAME . PARAM-ALIST) -\(NAME - (filename . FILE) - (front-context-string . FRONT-STR) - (rear-context-string . REAR-STR) - (position . POS) - (annotation . ANNOTATION)) +where the first form is the old deprecated one and the second is +the new favored one. PARAM-ALIST is typically of the form: -So the cdr of each bookmark is an alist too.") + ((filename . FILE) + (front-context-string . FRONT-STR) + (rear-context-string . REAR-STR) + (position . POS) + (annotation . ANNOTATION)))") (defvar bookmarks-already-loaded nil) @@ -312,23 +314,27 @@ (defun bookmark-all-names () "Return a list of all current bookmark names." (bookmark-maybe-load-default-file) - (mapcar - (lambda (full-record) - (bookmark-name-from-full-record full-record)) - bookmark-alist)) + (mapcar 'bookmark-name-from-full-record bookmark-alist)) (defun bookmark-get-bookmark (bookmark) - "Return the full entry for BOOKMARK in `bookmark-alist'. -If BOOKMARK is not a string, return nil." - (when (stringp bookmark) - (assoc-string bookmark bookmark-alist bookmark-completion-ignore-case))) + "Return the bookmark record corresponding to BOOKMARK. +If BOOKMARK is already a bookmark record, just return it, +Otherwise look for the corresponding bookmark in `bookmark-alist'." + (cond + ((consp bookmark) bookmark) + ((stringp bookmark) + (assoc-string bookmark bookmark-alist bookmark-completion-ignore-case)))) (defun bookmark-get-bookmark-record (bookmark) "Return the guts of the entry for BOOKMARK in `bookmark-alist'. That is, all information but the name." - (car (cdr (bookmark-get-bookmark bookmark)))) + (let ((alist (cdr (bookmark-get-bookmark bookmark)))) + ;; The bookmark objects can either look like (NAME ALIST) or + ;; (NAME . ALIST), so we have to distinguish the two here. + (if (and (null (cdr alist)) (consp (caar alist))) + (car alist) alist))) (defun bookmark-set-name (bookmark newname) @@ -365,11 +371,7 @@ (defun bookmark-set-filename (bookmark filename) "Set the full filename of BOOKMARK to FILENAME." - (bookmark-prop-set bookmark 'filename filename) - (setq bookmark-alist-modification-count - (1+ bookmark-alist-modification-count)) - (if (bookmark-time-to-save-p) - (bookmark-save))) + (bookmark-prop-set bookmark 'filename filename)) (defun bookmark-get-position (bookmark) @@ -441,26 +443,26 @@ (interactive-p) (setq bookmark-history (cons ,string bookmark-history)))) -(defvar bookmark-make-record-function 'bookmark-make-record-for-text-file +(defvar bookmark-make-record-function 'bookmark-make-record-default "A function that should be called to create a bookmark record. Modes may set this variable buffer-locally to enable bookmarking of locations that should be treated specially, such as Info nodes, news posts, images, pdf documents, etc. The function will be called with no arguments. +It should signal a user error if it is unable to construct a record for +the current location. The returned record should be a cons cell of the form (NAME . ALIST) where ALIST is as described in `bookmark-alist' and may typically contain a special cons (handler . SOME-FUNCTION) which sets the handler function that should be used to open this bookmark instead of -`bookmark-default-handler'. The handler should return an alist like the -one that function returns, and (of course) should likewise -not select the buffer. -It should signal a user error if it is unable to construct a record for the current -location. +`bookmark-default-handler'. The handler should follow the same calling +convention as the one used by `bookmark-default-handler'. NAME is a suggested name for the constructed bookmark. It can be nil -in which case a default heuristic will be used.") +in which case a default heuristic will be used. The function can also +equivalently just return ALIST without NAME.") (defun bookmark-make-record () "Return a new bookmark record (NAME . ALIST) for the current location." @@ -487,13 +489,14 @@ (if (and (bookmark-get-bookmark stripped-name) (not no-overwrite)) ;; already existing bookmark under that name and ;; no prefix arg means just overwrite old bookmark - (setcdr (bookmark-get-bookmark stripped-name) (list alist)) + ;; Use the new (NAME . ALIST) format. + (setcdr (bookmark-get-bookmark stripped-name) alist) ;; otherwise just cons it onto the front (either the bookmark ;; doesn't exist already, or there is no prefix arg. In either ;; case, we want the new bookmark consed onto the alist...) - (push (list stripped-name alist) bookmark-alist)) + (push (cons stripped-name alist) bookmark-alist)) ;; Added by db (setq bookmark-current-bookmark stripped-name) @@ -505,11 +508,13 @@ (setq bookmark-current-bookmark stripped-name) (bookmark-bmenu-surreptitiously-rebuild-list))) -(defun bookmark-make-record-for-text-file () +(defun bookmark-make-record-default (&optional point-only) "Return the record describing the location of a new bookmark. Must be at the correct position in the buffer in which the bookmark is -being set (this might change someday)." - `((filename . ,(bookmark-buffer-file-name)) +being set. +If POINT-ONLY is non-nil, then only return the subset of the +record that pertains to the location within the buffer." + `(,@(unless point-only `((filename . ,(bookmark-buffer-file-name)))) (front-context-string . ,(if (>= (- (point-max) (point)) bookmark-search-size) (buffer-substring-no-properties @@ -871,14 +876,13 @@ (interactive) ;; get the next word from the buffer and append it to the name of ;; the bookmark currently being set. - (let ((string (save-excursion - (set-buffer bookmark-current-buffer) - (goto-char bookmark-yank-point) - (buffer-substring-no-properties - (point) - (progn - (forward-word 1) - (setq bookmark-yank-point (point))))))) + (let ((string (with-current-buffer bookmark-current-buffer + (goto-char bookmark-yank-point) + (buffer-substring-no-properties + (point) + (progn + (forward-word 1) + (setq bookmark-yank-point (point))))))) (insert string))) (defun bookmark-buffer-file-name () @@ -929,6 +933,21 @@ "Hook run after `bookmark-jump' jumps to a bookmark. Useful for example to unhide text in `outline-mode'.") +(defun bookmark--jump-via (bookmark display-function) + (bookmark-jump-noselect bookmark) + (save-current-buffer + (funcall display-function (current-buffer))) + (let ((win (get-buffer-window (current-buffer) 0))) + (if win (set-window-point win (point)))) + ;; FIXME: we used to only run bookmark-after-jump-hook in + ;; `bookmark-jump' itself, but in none of the other commands. + (run-hooks 'bookmark-after-jump-hook) + (if bookmark-automatically-show-annotations + ;; if there is an annotation for this bookmark, + ;; show it in a buffer. + (bookmark-show-annotation bookmark))) + + ;;;###autoload (defun bookmark-jump (bookmark) "Jump to bookmark BOOKMARK (a point in some file). @@ -947,15 +966,7 @@ (unless bookmark (error "No bookmark specified")) (bookmark-maybe-historicize-string bookmark) - (let ((alist (bookmark-jump-noselect bookmark))) - (and alist - (switch-to-buffer (cadr (assq 'buffer alist))) - (goto-char (cadr (assq 'position alist))) - (progn (run-hooks 'bookmark-after-jump-hook) t) - (if bookmark-automatically-show-annotations - ;; if there is an annotation for this bookmark, - ;; show it in a buffer. - (bookmark-show-annotation bookmark))))) + (bookmark--jump-via bookmark 'switch-to-buffer)) ;;;###autoload @@ -969,14 +980,7 @@ (list bkm) bkm))) (when bookmark (bookmark-maybe-historicize-string bookmark) - (let ((alist (bookmark-jump-noselect bookmark))) - (and alist - (switch-to-buffer-other-window (cadr (assq 'buffer alist))) - (goto-char (cadr (assq 'position alist))) - (if bookmark-automatically-show-annotations - ;; if there is an annotation for this bookmark, - ;; show it in a buffer. - (bookmark-show-annotation bookmark)))))) + (bookmark--jump-via bookmark 'switch-to-buffer-other-window))) (defun bookmark-file-or-variation-thereof (file) @@ -1000,66 +1004,75 @@ (if (vc-backend file) file)))) (defun bookmark-jump-noselect (bookmark) - "Call BOOKMARK's handler or `bookmark-default-handler' if it has none." - (let ((found (funcall (or (bookmark-get-handler bookmark) - 'bookmark-default-handler) - bookmark))) - (unless found - ;; Else unable to find the marked file, so ask if user wants to - ;; relocate the bookmark, else remind them to consider deletion. - (let ((file (bookmark-get-filename bookmark))) - (when file ;Don't know how to relocate if there's no `file'. - (setq file (expand-file-name file)) - (ding) - (if (y-or-n-p (concat (file-name-nondirectory file) - " nonexistent. Relocate \"" - bookmark - "\"? ")) - (progn - (bookmark-relocate bookmark) - ;; Try again. - (setq found (funcall (or (bookmark-get-handler bookmark) - 'bookmark-default-handler) - bookmark))) - (message - "Bookmark not relocated; consider removing it \(%s\)." bookmark))))) - (when found - ;; Added by db. - (setq bookmark-current-bookmark bookmark) - found))) + "Call BOOKMARK's handler or `bookmark-default-handler' if it has none. +Changes current buffer and point and returns nil, or signals a `file-error'. +BOOKMARK can be a bookmark record used internally by some other +elisp package, or the name of a bookmark to be found in `bookmark-alist'." + (condition-case err + (funcall (or (bookmark-get-handler bookmark) + 'bookmark-default-handler) + (bookmark-get-bookmark bookmark)) + (file-error + ;; We were unable to find the marked file, so ask if user wants to + ;; relocate the bookmark, else remind them to consider deletion. + (when (stringp bookmark) + ;; `bookmark' can either be a bookmark name (found in + ;; `bookmark-alist') or a bookmark object. If it's an object, we + ;; assume it's a bookmark used internally by some other package. + (let ((file (bookmark-get-filename bookmark))) + (when file ;Don't know how to relocate if there's no `file'. + (setq file (expand-file-name file)) + (ding) + (if (y-or-n-p (concat (file-name-nondirectory file) + " nonexistent. Relocate \"" + bookmark + "\"? ")) + (progn + (bookmark-relocate bookmark) + ;; Try again. + (funcall (or (bookmark-get-handler bookmark) + 'bookmark-default-handler) + (bookmark-get-bookmark bookmark))) + (message + "Bookmark not relocated; consider removing it \(%s\)." bookmark) + (signal (car err) (cdr err)))))))) + ;; Added by db. + (when (stringp bookmark) + (setq bookmark-current-bookmark bookmark)) + nil) -(defun bookmark-default-handler (str) - ;; Helper for bookmark-jump. STR is a bookmark name, of the sort - ;; accepted by `bookmark-get-bookmark'. - ;; - ;; Return an alist '((buffer BUFFER) (position POSITION) ...) - ;; indicating the bookmarked point within the specied buffer. Any - ;; elements not documented here should be ignored. - (bookmark-maybe-load-default-file) - (let* ((file (expand-file-name (bookmark-get-filename str))) - (forward-str (bookmark-get-front-context-string str)) - (behind-str (bookmark-get-rear-context-string str)) - (place (bookmark-get-position str))) +(defun bookmark-default-handler (bmk) + "Default handler to jump to a particular bookmark location. +BMK is a bookmark record. +Changes current buffer and point and returns nil, or signals a `file-error'." + (let* ((file (bookmark-get-filename bmk)) + (buf (bookmark-prop-get bmk 'buffer)) + (forward-str (bookmark-get-front-context-string bmk)) + (behind-str (bookmark-get-rear-context-string bmk)) + (place (bookmark-get-position bmk))) ;; FIXME: bookmark-file-or-variation-thereof was needed for Info files, ;; but now that Info bookmarks are handled elsewhere it seems that we ;; should be able to get rid of it. --Stef - (if (setq file (bookmark-file-or-variation-thereof file)) - (with-current-buffer (find-file-noselect file) - (goto-char place) + (if (not (if buf (buffer-live-p buf) + (setq file (bookmark-file-or-variation-thereof file)))) + (signal 'file-error + `("Jumping to bookmark" "No such file or directory" + (bookmark-get-filename bmk))) + (set-buffer (or buf (find-file-noselect file))) + (if place (goto-char place)) - ;; Go searching forward first. Then, if forward-str exists and - ;; was found in the file, we can search backward for behind-str. - ;; Rationale is that if text was inserted between the two in the - ;; file, it's better to be put before it so you can read it, - ;; rather than after and remain perhaps unaware of the changes. - (if forward-str - (if (search-forward forward-str (point-max) t) - (goto-char (match-beginning 0)))) - (if behind-str - (if (search-backward behind-str (point-min) t) - (goto-char (match-end 0)))) - `((buffer ,(current-buffer)) (position ,(point))))))) - + ;; Go searching forward first. Then, if forward-str exists and + ;; was found in the file, we can search backward for behind-str. + ;; Rationale is that if text was inserted between the two in the + ;; file, it's better to be put before it so you can read it, + ;; rather than after and remain perhaps unaware of the changes. + (if forward-str + (if (search-forward forward-str (point-max) t) + (goto-char (match-beginning 0)))) + (if behind-str + (if (search-backward behind-str (point-min) t) + (goto-char (match-end 0))))) + nil)) ;;;###autoload (defun bookmark-relocate (bookmark) @@ -1076,6 +1089,10 @@ (format "Relocate %s to: " bookmark) (file-name-directory bmrk-filename))))) (bookmark-set-filename bookmark newloc) + (setq bookmark-alist-modification-count + (1+ bookmark-alist-modification-count)) + (if (bookmark-time-to-save-p) + (bookmark-save)) (bookmark-bmenu-surreptitiously-rebuild-list))) @@ -1159,8 +1176,8 @@ (bookmark-maybe-load-default-file) (let ((orig-point (point)) (str-to-insert - (save-excursion - (set-buffer (cadr (assq 'buffer (bookmark-jump-noselect bookmark)))) + (save-current-buffer + (bookmark-jump-noselect bookmark) (buffer-string)))) (insert str-to-insert) (push-mark) @@ -1262,29 +1279,26 @@ (defun bookmark-write-file (file) - (save-excursion - (save-window-excursion - (bookmark-maybe-message "Saving bookmarks to file %s..." file) - (set-buffer (get-buffer-create " *Bookmarks*")) - (goto-char (point-min)) - (delete-region (point-min) (point-max)) - (let ((print-length nil) - (print-level nil)) - (bookmark-insert-file-format-version-stamp) - (pp bookmark-alist (current-buffer)) - (let ((version-control - (cond - ((null bookmark-version-control) nil) - ((eq 'never bookmark-version-control) 'never) - ((eq 'nospecial bookmark-version-control) version-control) - (t - t)))) - (condition-case nil - (write-region (point-min) (point-max) file) - (file-error (message "Can't write %s" file))) - (kill-buffer (current-buffer)) - (bookmark-maybe-message - "Saving bookmarks to file %s...done" file)))))) + (bookmark-maybe-message "Saving bookmarks to file %s..." file) + (with-current-buffer (get-buffer-create " *Bookmarks*") + (goto-char (point-min)) + (delete-region (point-min) (point-max)) + (let ((print-length nil) + (print-level nil)) + (bookmark-insert-file-format-version-stamp) + (pp bookmark-alist (current-buffer)) + (let ((version-control + (cond + ((null bookmark-version-control) nil) + ((eq 'never bookmark-version-control) 'never) + ((eq 'nospecial bookmark-version-control) version-control) + (t t)))) + (condition-case nil + (write-region (point-min) (point-max) file) + (file-error (message "Can't write %s" file))) + (kill-buffer (current-buffer)) + (bookmark-maybe-message + "Saving bookmarks to file %s...done" file))))) (defun bookmark-import-new-list (new-list) @@ -1347,41 +1361,39 @@ ;;I guess it's better than none at all. "~/" bookmark-default-file 'confirm))) (setq file (expand-file-name file)) - (if (file-readable-p file) - (save-excursion - (save-window-excursion - (if (null no-msg) - (bookmark-maybe-message "Loading bookmarks from %s..." file)) - (set-buffer (let ((enable-local-variables nil)) - (find-file-noselect file))) - (goto-char (point-min)) - (bookmark-maybe-upgrade-file-format) - (let ((blist (bookmark-alist-from-buffer))) - (if (listp blist) - (progn - (if overwrite - (progn - (setq bookmark-alist blist) - (setq bookmark-alist-modification-count 0)) - ;; else - (bookmark-import-new-list blist) - (setq bookmark-alist-modification-count - (1+ bookmark-alist-modification-count))) - (if (string-equal - (expand-file-name bookmark-default-file) - file) - (setq bookmarks-already-loaded t)) - (bookmark-bmenu-surreptitiously-rebuild-list)) - (error "Invalid bookmark list in %s" file))) - (kill-buffer (current-buffer))) - (if (null no-msg) - (bookmark-maybe-message "Loading bookmarks from %s...done" file))) - (error "Cannot read bookmark file %s" file))) + (if (not (file-readable-p file)) + (error "Cannot read bookmark file %s" file) + (if (null no-msg) + (bookmark-maybe-message "Loading bookmarks from %s..." file)) + (with-current-buffer (let ((enable-local-variables nil)) + (find-file-noselect file)) + (goto-char (point-min)) + (bookmark-maybe-upgrade-file-format) + (let ((blist (bookmark-alist-from-buffer))) + (if (listp blist) + (progn + (if overwrite + (progn + (setq bookmark-alist blist) + (setq bookmark-alist-modification-count 0)) + ;; else + (bookmark-import-new-list blist) + (setq bookmark-alist-modification-count + (1+ bookmark-alist-modification-count))) + (if (string-equal + (expand-file-name bookmark-default-file) + file) + (setq bookmarks-already-loaded t)) + (bookmark-bmenu-surreptitiously-rebuild-list)) + (error "Invalid bookmark list in %s" file))) + (kill-buffer (current-buffer))) + (if (null no-msg) + (bookmark-maybe-message "Loading bookmarks from %s...done" file)))) -;;; Code supporting the dired-like bookmark menu. Prefix is -;;; "bookmark-bmenu" for "buffer-menu": +;;; Code supporting the dired-like bookmark menu. +;; Prefix is "bookmark-bmenu" for "buffer-menu": (defvar bookmark-bmenu-bookmark-column nil) @@ -1789,11 +1801,8 @@ (pop-up-windows t)) (delete-other-windows) (switch-to-buffer (other-buffer)) - (let* ((alist (bookmark-jump-noselect bmrk)) - (buff (cadr (assq 'buffer alist))) - (pos (cadr (assq 'position alist)))) - (pop-to-buffer buff) - (goto-char pos)) + (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed? + (bookmark--jump-via bmrk 'pop-to-buffer)) (bury-buffer menu)))) @@ -1809,13 +1818,8 @@ (interactive) (let ((bookmark (bookmark-bmenu-bookmark))) (if (bookmark-bmenu-check-position) - (let* ((alist (bookmark-jump-noselect bookmark)) - (buff (cadr (assq 'buffer alist))) - (pos (cadr (assq 'position alist)))) - (switch-to-buffer-other-window buff) - (goto-char pos) - (set-window-point (get-buffer-window buff) pos) - (bookmark-show-annotation bookmark))))) + (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? + (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))) (defun bookmark-bmenu-switch-other-window () @@ -1827,23 +1831,13 @@ same-window-buffer-names same-window-regexps) (if (bookmark-bmenu-check-position) - (let* ((alist (bookmark-jump-noselect bookmark)) - (buff (cadr (assq 'buffer alist))) - (pos (cadr (assq 'position alist)))) - (display-buffer buff) - (let ((o-buffer (current-buffer))) - ;; save-excursion won't do - (set-buffer buff) - (goto-char pos) - (set-window-point (get-buffer-window buff) pos) - (set-buffer o-buffer)) - (bookmark-show-annotation bookmark))))) + (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? + (bookmark--jump-via bookmark 'display-buffer))))) (defun bookmark-bmenu-other-window-with-mouse (event) "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible." (interactive "e") - (save-excursion - (set-buffer (window-buffer (posn-window (event-end event)))) + (with-current-buffer (window-buffer (posn-window (event-end event))) (save-excursion (goto-char (posn-point (event-end event))) (bookmark-bmenu-other-window)))) @@ -2064,11 +2058,11 @@ ;;;; end bookmark menu stuff ;;;; -;;; Load Hook +;; Load Hook (defvar bookmark-load-hook nil "Hook run at the end of loading bookmark.") -;;; Exit Hook, called from kill-emacs-hook +;; Exit Hook, called from kill-emacs-hook (defvar bookmark-exit-hook nil "Hook run when Emacs exits.")
--- a/lisp/doc-view.el Wed Jun 25 15:46:23 2008 +0000 +++ b/lisp/doc-view.el Wed Jun 25 16:51:33 2008 +0000 @@ -1187,29 +1187,28 @@ ;;;; Bookmark integration -(declare-function bookmark-buffer-file-name "bookmark" ()) +(declare-function bookmark-make-record-default "bookmark" ()) (declare-function bookmark-prop-get "bookmark" (bookmark prop)) +(declare-function bookmark-default-handler "bookmark" (bmk)) (defun doc-view-bookmark-make-record () - `((filename . ,(bookmark-buffer-file-name)) - (page . ,(doc-view-current-page)) - (handler . doc-view-bookmark-jump))) + (nconc (bookmark-make-record-default) + `((page . ,(doc-view-current-page)) + (handler . doc-view-bookmark-jump)))) ;;;###autoload (defun doc-view-bookmark-jump (bmk) ;; This implements the `handler' function interface for record type ;; returned by `doc-view-bookmark-make-record', which see. - (let ((filename (bookmark-prop-get bmk 'filename)) - (page (bookmark-prop-get bmk 'page))) - (with-current-buffer (find-file-noselect filename) + (prog1 (bookmark-default-handler bmk) + (let ((page (bookmark-prop-get bmk 'page))) (when (not (eq major-mode 'doc-view-mode)) - (doc-view-toggle-display)) + (doc-view-toggle-display)) (with-selected-window (or (get-buffer-window (current-buffer) 0) (selected-window)) - (doc-view-goto-page page)) - `((buffer ,(current-buffer)) (position ,1))))) + (doc-view-goto-page page))))) (provide 'doc-view)
--- a/lisp/image-mode.el Wed Jun 25 15:46:23 2008 +0000 +++ b/lisp/image-mode.el Wed Jun 25 16:51:33 2008 +0000 @@ -467,41 +467,24 @@ (message "Repeat this command to go back to displaying the file as text"))))) ;;; Support for bookmark.el - -(defun image-bookmark-make-record (annotation) - (let ((the-record - `((filename . ,(buffer-file-name)) - (image-type . ,image-type) - (position . ,(point)) - (handler . image-bookmark-jump)))) +(declare-function bookmark-make-record-default "bookmark" ()) +(declare-function bookmark-prop-get "bookmark" (bookmark prop)) +(declare-function bookmark-default-handler "bookmark" (bmk)) - ;; Take no chances with text properties - (set-text-properties 0 (length annotation) nil annotation) - - (when annotation - (nconc the-record (list (cons 'annotation annotation)))) +(defun image-bookmark-make-record () + (nconc (bookmark-make-record-default) + `((image-type . ,image-type) + (handler . image-bookmark-jump)))) - ;; Finally, return the completed record. - the-record)) -(declare-function bookmark-get-filename "bookmark" (bookmark)) -(declare-function bookmark-get-bookmark-record "bookmark" (bookmark)) -(declare-function bookmark-get-position "bookmark" (bookmark)) ;;;###autoload (defun image-bookmark-jump (bmk) ;; This implements the `handler' function interface for record type ;; 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)))) - (pos (bookmark-get-position bmk))) - (find-file filename) - (when (not (string= image-type type)) - (image-toggle-display)) - (when (string= image-type "text") - (goto-char pos)) - `((buffer ,(current-buffer)) (position ,(point)))))) + (prog1 (bookmark-default-handler bmk) + (when (not (string= image-type (bookmark-prop-get bmk 'image-type))) + (image-toggle-display)))) (provide 'image-mode)
--- a/lisp/info.el Wed Jun 25 15:46:23 2008 +0000 +++ b/lisp/info.el Wed Jun 25 16:51:33 2008 +0000 @@ -34,7 +34,7 @@ ;;; Code: -(eval-when-compile (require 'jka-compr)) +(eval-when-compile (require 'jka-compr) (require 'cl)) (defgroup info nil "Info subsystem." @@ -4379,62 +4379,30 @@ '(Info-mode . Info-restore-desktop-buffer)) ;;;; Bookmark support - -(defvar bookmark-search-size) - -;; This is only called from bookmark.el. -(declare-function bookmark-buffer-file-name "bookmark" ()) +(declare-function bookmark-make-record-default "bookmark" (&optional pos-only)) +(declare-function bookmark-prop-get "bookmark" (bookmark prop)) +(declare-function bookmark-default-handler "bookmark" (bmk)) +(declare-function bookmark-get-bookmark-record "bookmark" (bmk)) (defun Info-bookmark-make-record () `(,Info-current-node - (filename . ,(bookmark-buffer-file-name)) - (front-context-string - . ,(if (>= (- (point-max) (point)) bookmark-search-size) - (buffer-substring-no-properties - (point) - (+ (point) bookmark-search-size)) - nil)) - (rear-context-string - . ,(if (>= (- (point) (point-min)) bookmark-search-size) - (buffer-substring-no-properties - (point) - (- (point) bookmark-search-size)) - nil)) + ,@(bookmark-make-record-default 'point-only) + (filename . ,Info-current-file) (info-node . ,Info-current-node) (handler . Info-bookmark-jump))) - -(defvar bookmark-current-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)) - ;;;###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-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 - (with-no-warnings - (Info-find-node file info-node)) - ;; Go searching forward first. Then, if forward-str exists and was - ;; found in the file, we can search backward for behind-str. - ;; Rationale is that if text was inserted between the two in the - ;; file, it's better to be put before it so you can read it, rather - ;; than after and remain perhaps unaware of the changes. - (if forward-str - (if (search-forward forward-str (point-max) t) - (goto-char (match-beginning 0)))) - (if behind-str - (if (search-backward behind-str (point-min) t) - (goto-char (match-end 0)))) - `((buffer ,(current-buffer)) (position ,(point)))))))) + (let* ((file (bookmark-prop-get bmk 'filename)) + (info-node (bookmark-prop-get bmk 'info-node)) + (buf (save-window-excursion ;FIXME: doesn't work with frames! + (Info-find-node file info-node) (current-buffer)))) + ;; Use bookmark-default-handler to move to the appropriate location + ;; within the node. + (bookmark-default-handler + (list* "" `(buffer . ,buf) (bookmark-get-bookmark-record bmk))))) (provide 'info)