aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2005-10-18 18:29:11 +0000
committerRomain Francoise2005-10-18 18:29:11 +0000
commit8b1b64617b37243f75c4052653761d2e2a3943f3 (patch)
tree9a023d3fe7026a83d6f368163c9a008226f2401f
parent67f05bf61a50c0b8aef001f43a6c2c2364a9edba (diff)
downloademacs-8b1b64617b37243f75c4052653761d2e2a3943f3.tar.gz
emacs-8b1b64617b37243f75c4052653761d2e2a3943f3.zip
* bookmark.el (bookmark-insert-location, bookmark-bmenu-list)
(bookmark-bmenu-hide-filenames): Improve help-echo text.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/bookmark.el45
2 files changed, 25 insertions, 21 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90638b823db..da7c1765255 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,7 @@
14 14
15 * bookmark.el (bookmark-insert-location, bookmark-bmenu-list) 15 * bookmark.el (bookmark-insert-location, bookmark-bmenu-list)
16 (bookmark-bmenu-hide-filenames): Add follow-link property. 16 (bookmark-bmenu-hide-filenames): Add follow-link property.
17 Improve help-echo text.
17 18
18 * ffap.el (find-file-at-point): Doc fix. 19 * ffap.el (find-file-at-point): Doc fix.
19 20
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 0ad70f6e3a7..75228288fff 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1175,13 +1175,14 @@ minibuffer history list `bookmark-history'."
1175 (prog1 1175 (prog1
1176 (insert (bookmark-location bookmark)) ; *Return this line* 1176 (insert (bookmark-location bookmark)) ; *Return this line*
1177 (if (and (display-color-p) (display-mouse-p)) 1177 (if (and (display-color-p) (display-mouse-p))
1178 (add-text-properties start 1178 (add-text-properties
1179 (save-excursion (re-search-backward 1179 start
1180 "[^ \t]") 1180 (save-excursion (re-search-backward
1181 "[^ \t]")
1181 (1+ (point))) 1182 (1+ (point)))
1182 '(mouse-face highlight 1183 '(mouse-face highlight
1183 follow-link t 1184 follow-link t
1184 help-echo "mouse-2: go to this bookmark")))))) 1185 help-echo "mouse-2: go to this bookmark in other window"))))))
1185 1186
1186;;;###autoload 1187;;;###autoload
1187(defalias 'bookmark-locate 'bookmark-insert-location) 1188(defalias 'bookmark-locate 'bookmark-insert-location)
@@ -1567,13 +1568,14 @@ deletion, or > if it is flagged for displaying."
1567 (let ((start (point))) 1568 (let ((start (point)))
1568 (insert (bookmark-name-from-full-record full-record)) 1569 (insert (bookmark-name-from-full-record full-record))
1569 (if (and (display-color-p) (display-mouse-p)) 1570 (if (and (display-color-p) (display-mouse-p))
1570 (add-text-properties start 1571 (add-text-properties
1571 (save-excursion (re-search-backward 1572 start
1572 "[^ \t]") 1573 (save-excursion (re-search-backward
1573 (1+ (point))) 1574 "[^ \t]")
1574 '(mouse-face highlight 1575 (1+ (point)))
1575 follow-link t 1576 '(mouse-face highlight
1576 help-echo "mouse-2: go to this bookmark"))) 1577 follow-link t
1578 help-echo "mouse-2: go to this bookmark in other window")))
1577 (insert "\n") 1579 (insert "\n")
1578 ))) 1580 )))
1579 bookmark-alist)) 1581 bookmark-alist))
@@ -1697,14 +1699,15 @@ Optional argument SHOW means show them unconditionally."
1697 (let ((start (point))) 1699 (let ((start (point)))
1698 (insert (car bookmark-bmenu-hidden-bookmarks)) 1700 (insert (car bookmark-bmenu-hidden-bookmarks))
1699 (if (and (display-color-p) (display-mouse-p)) 1701 (if (and (display-color-p) (display-mouse-p))
1700 (add-text-properties start 1702 (add-text-properties
1701 (save-excursion (re-search-backward 1703 start
1702 "[^ \t]") 1704 (save-excursion (re-search-backward
1703 (1+ (point))) 1705 "[^ \t]")
1704 '(mouse-face highlight 1706 (1+ (point)))
1705 follow-link t 1707 '(mouse-face highlight
1706 help-echo 1708 follow-link t
1707 "mouse-2: go to this bookmark")))) 1709 help-echo
1710 "mouse-2: go to this bookmark in other window"))))
1708 (setq bookmark-bmenu-hidden-bookmarks 1711 (setq bookmark-bmenu-hidden-bookmarks
1709 (cdr bookmark-bmenu-hidden-bookmarks)) 1712 (cdr bookmark-bmenu-hidden-bookmarks))
1710 (forward-line 1)))))))) 1713 (forward-line 1))))))))