diff options
| author | Paul Eggert | 2016-05-01 18:07:56 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-05-01 18:07:56 -0700 |
| commit | b57c1741abfb95da1dc6c165339551daff2ca3e1 (patch) | |
| tree | d3b51835457ca49fe59b311b5c72ee9cd272414d /lisp | |
| parent | 309cefe0c2ecabc4ae10d6b86141b92f7c14e74e (diff) | |
| parent | 5a952eb7f6a6b2a0a050cba618a4424e638a861a (diff) | |
| download | emacs-b57c1741abfb95da1dc6c165339551daff2ca3e1.tar.gz emacs-b57c1741abfb95da1dc6c165339551daff2ca3e1.zip | |
Merge from origin/emacs-25
5a952eb Don't mention ~/.emacs.bmk literally in doc strings
c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o...
c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bookmark.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index c2f8cc3fbc1..f3c8b2a755f 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 | |||
| 74 | behavior.) | 74 | behavior.) |
| 75 | 75 | ||
| 76 | To specify the file in which to save them, modify the variable | 76 | To specify the file in which to save them, modify the variable |
| 77 | `bookmark-default-file', which is `~/.emacs.bmk' by default." | 77 | `bookmark-default-file'." |
| 78 | :type '(choice (const nil) integer (other t)) | 78 | :type '(choice (const nil) integer (other t)) |
| 79 | :group 'bookmark) | 79 | :group 'bookmark) |
| 80 | 80 | ||
| @@ -1481,9 +1481,9 @@ while loading. | |||
| 1481 | If you load a file that doesn't contain a proper bookmark alist, you | 1481 | If you load a file that doesn't contain a proper bookmark alist, you |
| 1482 | will corrupt Emacs's bookmark list. Generally, you should only load | 1482 | will corrupt Emacs's bookmark list. Generally, you should only load |
| 1483 | in files that were created with the bookmark functions in the first | 1483 | in files that were created with the bookmark functions in the first |
| 1484 | place. Your own personal bookmark file, `~/.emacs.bmk', is | 1484 | place. Your own personal bookmark file, specified by the variable |
| 1485 | maintained automatically by Emacs; you shouldn't need to load it | 1485 | `bookmark-default-file', is maintained automatically by Emacs; you |
| 1486 | explicitly. | 1486 | shouldn't need to load it explicitly. |
| 1487 | 1487 | ||
| 1488 | If you load a file containing bookmarks with the same names as | 1488 | If you load a file containing bookmarks with the same names as |
| 1489 | bookmarks already present in your Emacs, the new bookmarks will get | 1489 | bookmarks already present in your Emacs, the new bookmarks will get |