diff options
| author | Stefan Kangas | 2019-06-09 16:26:55 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-06-09 16:29:21 -0700 |
| commit | 9816aba5185dd95ca0981cf2b35ce2b1024ca497 (patch) | |
| tree | 5001aa42895f301bcb2887a91f128aefe05c36bd /lisp | |
| parent | 3a29764d916905ed8c165e63bc0d581d5f056e63 (diff) | |
| download | emacs-9816aba5185dd95ca0981cf2b35ce2b1024ca497.tar.gz emacs-9816aba5185dd95ca0981cf2b35ce2b1024ca497.zip | |
Make `bookmark-file' variable obsolete
* lisp/bookmark.el (bookmark-file): Redefine as obsolete variable
alias for `bookmark-default-file'. (Bug#35917)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bookmark.el | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 89f594c1866..d4fe2d9050c 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -82,15 +82,9 @@ To specify the file in which to save them, modify the variable | |||
| 82 | "The `.emacs.bmk' file used to be called this name.") | 82 | "The `.emacs.bmk' file used to be called this name.") |
| 83 | 83 | ||
| 84 | 84 | ||
| 85 | ;; defvared to avoid a compilation warning: | 85 | (define-obsolete-variable-alias 'bookmark-file 'bookmark-default-file "27.1") |
| 86 | (defvar bookmark-file nil | ||
| 87 | "Old name for `bookmark-default-file'.") | ||
| 88 | |||
| 89 | (defcustom bookmark-default-file | 86 | (defcustom bookmark-default-file |
| 90 | (if bookmark-file | 87 | (locate-user-emacs-file "bookmarks" ".emacs.bmk") |
| 91 | ;; In case user set `bookmark-file' in her .emacs: | ||
| 92 | bookmark-file | ||
| 93 | (locate-user-emacs-file "bookmarks" ".emacs.bmk")) | ||
| 94 | "File in which to save bookmarks by default." | 88 | "File in which to save bookmarks by default." |
| 95 | :type 'file | 89 | :type 'file |
| 96 | :group 'bookmark) | 90 | :group 'bookmark) |