Mercurial > emacs
changeset 106933:2afe12cb88f4
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 13 Jan 2010 23:35:16 +0000 |
| parents | 91a0123d1993 (current diff) 203a882ff4c0 (diff) |
| children | 65e9e6e166f6 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jan 13 22:04:10 2010 +0000 +++ b/lisp/ChangeLog Wed Jan 13 23:35:16 2010 +0000 @@ -1,3 +1,7 @@ +2010-01-13 Karl Fogel <kfogel@red-bean.com> + + * bookmark.el (bookmark-bmenu-execute-deletions): Doc fix (Bug#5276). + 2010-01-12 Michael Albinus <michael.albinus@gmx.de> * files.el (copy-directory): Compute target for recursive
--- a/lisp/bookmark.el Wed Jan 13 22:04:10 2010 +0000 +++ b/lisp/bookmark.el Wed Jan 13 23:35:16 2010 +0000 @@ -1960,7 +1960,7 @@ (defun bookmark-bmenu-execute-deletions () - "Delete bookmarks marked with \\<Buffer-menu-mode-map>\\[Buffer-menu-delete] commands." + "Delete bookmarks flagged `D'." (interactive) (message "Deleting bookmarks...") (let ((o-point (point))