mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

Add a new field `location' to bookmarks for non-file bookmarks.

Browse Source 
* bookmark.el (bookmark-location): Use the new field, if present.
(bookmark-insert-location): Undo last change, not needed any more.
* man.el (Man-bookmark-make-record):
* woman.el (woman-bookmark-make-record):
* gnus-sum.el (gnus-summary-bookmark-make-record): Add `location' field.
This commit is contained in:
Stefan Monnier 2010-04-14 11:07:53 -04:00
parent 7b05466ff6
commit ebb9641fb2
6 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ChangeLog
View File

@ -1,3 +1,11 @@
2010-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
Add a new field `location' to bookmarks for non-file bookmarks.
* bookmark.el (bookmark-location): Use the new field, if present.
(bookmark-insert-location): Undo last change, not needed any more.
* man.el (Man-bookmark-make-record):
* woman.el (woman-bookmark-make-record): Add `location' field.
2010-04-14 Juri Linkov <juri@jurta.org>
* simple.el (scroll-error-top-bottom): New defcustom.

14
lisp/bookmark.el
View File

@ -1176,9 +1176,7 @@ minibuffer history list `bookmark-history'."
(or no-history (bookmark-maybe-historicize-string bookmark))
(let ((start (point)))
(prog1
;; FIXME: Each bookmark should come with a `location' method
;; rather than just say "-- no file --".
(insert (or (bookmark-location bookmark) " -- no file --"))
(insert (bookmark-location bookmark))
(if (display-mouse-p)
(add-text-properties
start
@ -1193,10 +1191,16 @@ minibuffer history list `bookmark-history'."
(defalias 'bookmark-locate 'bookmark-insert-location)
(defun bookmark-location (bookmark)
"Return the name of the file associated with BOOKMARK, or nil if none.
"Return a description of the location of BOOKMARK.
BOOKMARK may be a bookmark name (a string) or a bookmark record."
(bookmark-maybe-load-default-file)
(bookmark-get-filename bookmark))
;; We could call the `handler' and ask for it to construct a description
;; dynamically: it would open up several new possibilities, but it
;; would have the major disadvantage of forcing to load each and
;; every handler when the user calls bookmark-menu.
(or (bookmark-prop-get bookmark 'location)
(bookmark-get-filename bookmark)
"-- Unknown location --"))
;;;###autoload

4
lisp/gnus/ChangeLog
View File

@ -1,3 +1,7 @@
2010-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
* gnus-sum.el (gnus-summary-bookmark-make-record): Add `location' field.
2010-04-12 Stefan Monnier <monnier@iro.umontreal.ca>
* gnus-sum.el: Add bookmark declarations to silence the compiler.

1
lisp/gnus/gnus-sum.el
View File

@ -12657,6 +12657,7 @@ If ALL is a number, fetch this number of articles."
(id (mail-header-id head)))
`(,subject
,@(bookmark-make-record-default 'point-only)
(location . ,(format "Gnus %s:%d:%s" grp art id))
(group . ,grp) (article . ,art)
(message-id . ,id) (handler . gnus-summary-bookmark-jump))))

1
lisp/man.el
View File

@ -1689,6 +1689,7 @@ Uses `Man-name-local-regexp'."
"Make a bookmark entry for a Man buffer."
`(,(Man-default-bookmark-title)
,@(bookmark-make-record-default 'point-only)
(location . ,(concat "man " Man-arguments))
(man-args . ,Man-arguments)
(handler . Man-bookmark-jump)))

1
lisp/woman.el
View File

@ -4533,6 +4533,7 @@ logging the message."
"Make a bookmark entry for a Woman buffer."
`(,(Man-default-bookmark-title)
,@(bookmark-make-record-default 'point-only)
(location . ,(concat "woman " woman-last-file-name))
;; Use the same form as man's bookmarks, as much as possible.
(man-args . ,woman-last-file-name)
(handler . woman-bookmark-jump)))