diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-08 16:41:43 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-08 16:41:43 -0700 |
| commit | fd60bf6c902b47daadda6ebf442045dbe1328941 (patch) | |
| tree | fd351a1fc087aefbca38b87102f06edf9f8b04ff /lisp/bookmark.el | |
| parent | ff2d0e8336c05cb7d3e86f7406784cefc1d6589e (diff) | |
| parent | 4181427f24e591f539122db2e3d8d8b55a7de7cd (diff) | |
| download | emacs-fd60bf6c902b47daadda6ebf442045dbe1328941.tar.gz | |
Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de
Diffstat (limited to 'lisp/bookmark.el')
| -rw-r--r-- | lisp/bookmark.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index e4e4ed9afcb..7ea54a8e2b4 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1420,8 +1420,7 @@ explicitly. If you load a file containing bookmarks with the same names as bookmarks already present in your Emacs, the new bookmarks will get -unique numeric suffixes \"<2>\", \"<3>\", ... following the same -method buffers use to resolve name collisions." +unique numeric suffixes \"<2>\", \"<3>\", etc." (interactive (list (read-file-name (format "Load bookmarks from: (%s) " |