mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

* lisp/bookmark.el: Consistently put the text property on the bookmark name.

Browse Source 
(bookmark-bmenu-marks-width): Bump back to 2, to include annotation marks.
  (bookmark-bmenu-hide-filenames): Adjust for above, and put the text
    property on the bookmark name, instead of not putting it at all.
  (bookmark-bmenu-list): Fix where we put the text property.
This commit is contained in:
Karl Fogel 2010-01-02 14:14:13 -05:00
parent 74255a512c
commit 5413628238
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ChangeLog
View File

@ -1,3 +1,12 @@
2010-01-02 Karl Fogel <kfogel@red-bean.com>
* bookmark.el: Consistently put the text property on the bookmark name.
(bookmark-bmenu-marks-width): Bump back to 2, to include
annotation marks.
(bookmark-bmenu-hide-filenames): Adjust for above, and put the text
property on the bookmark name, instead of not putting it at all.
(bookmark-bmenu-list): Fix where we put the text property.
2010-01-02 Karl Fogel <kfogel@red-bean.com> 2010-01-02 Karl Fogel <kfogel@red-bean.com>
* bookmark.el (bookmark-bmenu-save): Just depend on the new logic * bookmark.el (bookmark-bmenu-save): Just depend on the new logic

15
lisp/bookmark.el
View File

@ -132,8 +132,9 @@ recently set ones come first, oldest ones come last)."
(defconst bookmark-bmenu-header-height 2 (defconst bookmark-bmenu-header-height 2
"Number of lines used for the *Bookmark List* header.") "Number of lines used for the *Bookmark List* header.")
(defconst bookmark-bmenu-marks-width 1 (defconst bookmark-bmenu-marks-width 2
"Number of columns (chars) used for the *Bookmark List* marks column.") "Number of columns (chars) used for the *Bookmark List* marks column,
including the annotations column.")
(defcustom bookmark-bmenu-file-column 30 (defcustom bookmark-bmenu-file-column 30
"Column at which to display filenames in a buffer listing bookmarks. "Column at which to display filenames in a buffer listing bookmarks.
@ -1556,12 +1557,11 @@ deletion, or > if it is flagged for displaying."
" *" " ") " *" " ")
name) name)
(setq end (point)) (setq end (point))
(put-text-property start (put-text-property
(+ bookmark-bmenu-marks-width 1 start) (+ bookmark-bmenu-marks-width start) end 'bookmark-name-prop name)
'bookmark-name-prop name)
(when (display-mouse-p) (when (display-mouse-p)
(add-text-properties (add-text-properties
(+ bookmark-bmenu-marks-width 1 start) end (+ bookmark-bmenu-marks-width start) end
'(mouse-face highlight '(mouse-face highlight
follow-link t follow-link t
help-echo "mouse-2: go to this bookmark in other window"))) help-echo "mouse-2: go to this bookmark in other window")))
@ -1682,11 +1682,12 @@ mainly for debugging, and should not be necessary in normal use."
(nreverse bookmark-bmenu-hidden-bookmarks)) (nreverse bookmark-bmenu-hidden-bookmarks))
(let ((inhibit-read-only t)) (let ((inhibit-read-only t))
(while bookmark-bmenu-hidden-bookmarks (while bookmark-bmenu-hidden-bookmarks
(move-to-column (1+ bookmark-bmenu-marks-width) t) (move-to-column bookmark-bmenu-marks-width t)
(bookmark-kill-line) (bookmark-kill-line)
(let ((name (pop bookmark-bmenu-hidden-bookmarks)) (let ((name (pop bookmark-bmenu-hidden-bookmarks))
(start (point))) (start (point)))
(insert name) (insert name)
(put-text-property start (point) 'bookmark-name-prop name)
(if (display-mouse-p) (if (display-mouse-p)
(add-text-properties (add-text-properties
start (point) start (point)