diff options
| author | Karl Fogel <kfogel@red-bean.com> | 2010-01-02 14:14:13 -0500 |
|---|---|---|
| committer | Karl Fogel <kfogel@red-bean.com> | 2010-01-02 14:14:13 -0500 |
| commit | 541362823833fe6d4ebfb18574f9029552d7f656 (patch) | |
| tree | cfb1dd0a7c7291d4dac1c5934ddaa6c9de07342a /lisp/bookmark.el | |
| parent | 74255a512cf243a8718e53413d3eca0246aa3b08 (diff) | |
| download | emacs-541362823833fe6d4ebfb18574f9029552d7f656.tar.gz | |
* lisp/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.
Diffstat (limited to 'lisp/bookmark.el')
| -rw-r--r-- | lisp/bookmark.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index ef1886f612e..38f4478cbb4 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -132,8 +132,9 @@ recently set ones come first, oldest ones come last)." (defconst bookmark-bmenu-header-height 2 "Number of lines used for the *Bookmark List* header.") -(defconst bookmark-bmenu-marks-width 1 - "Number of columns (chars) used for the *Bookmark List* marks column.") +(defconst bookmark-bmenu-marks-width 2 + "Number of columns (chars) used for the *Bookmark List* marks column, +including the annotations column.") (defcustom bookmark-bmenu-file-column 30 "Column at which to display filenames in a buffer listing bookmarks. @@ -1556,12 +1557,11 @@ deletion, or > if it is flagged for displaying." " *" " ") name) (setq end (point)) - (put-text-property start - (+ bookmark-bmenu-marks-width 1 start) - 'bookmark-name-prop name) + (put-text-property + (+ bookmark-bmenu-marks-width start) end 'bookmark-name-prop name) (when (display-mouse-p) (add-text-properties - (+ bookmark-bmenu-marks-width 1 start) end + (+ bookmark-bmenu-marks-width start) end '(mouse-face highlight follow-link t 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)) (let ((inhibit-read-only t)) (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) (let ((name (pop bookmark-bmenu-hidden-bookmarks)) (start (point))) (insert name) + (put-text-property start (point) 'bookmark-name-prop name) (if (display-mouse-p) (add-text-properties start (point) |