[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 5a952eb: Don't mention ~/.emacs.bmk literally in
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 5a952eb: Don't mention ~/.emacs.bmk literally in doc strings |
Date: |
Mon, 25 Apr 2016 08:31:13 +0000 |
branch: emacs-25
commit 5a952eb7f6a6b2a0a050cba618a4424e638a861a
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Don't mention ~/.emacs.bmk literally in doc strings
* lisp/bookmark.el (bookmark-save-flag, bookmark-load): Don't
mention "~/.emacs.bmk" explicitly as the default bookmark file in
the doc strings. (Bug#23350)
---
lisp/bookmark.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index c2f8cc3..f3c8b2a 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -74,7 +74,7 @@ bookmark is to set this variable to 1 (or 0, which produces
the same
behavior.)
To specify the file in which to save them, modify the variable
-`bookmark-default-file', which is `~/.emacs.bmk' by default."
+`bookmark-default-file'."
:type '(choice (const nil) integer (other t))
:group 'bookmark)
@@ -1481,9 +1481,9 @@ while loading.
If you load a file that doesn't contain a proper bookmark alist, you
will corrupt Emacs's bookmark list. Generally, you should only load
in files that were created with the bookmark functions in the first
-place. Your own personal bookmark file, `~/.emacs.bmk', is
-maintained automatically by Emacs; you shouldn't need to load it
-explicitly.
+place. Your own personal bookmark file, specified by the variable
+`bookmark-default-file', is maintained automatically by Emacs; you
+shouldn't need to load it explicitly.
If you load a file containing bookmarks with the same names as
bookmarks already present in your Emacs, the new bookmarks will get
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 5a952eb: Don't mention ~/.emacs.bmk literally in doc strings,
Eli Zaretskii <=