summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2019-06-09 16:26:55 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-06-09 16:29:21 -0700
commit9816aba5185dd95ca0981cf2b35ce2b1024ca497 (patch)
tree5001aa42895f301bcb2887a91f128aefe05c36bd /lisp
parent3a29764d916905ed8c165e63bc0d581d5f056e63 (diff)
downloademacs-9816aba5185dd95ca0981cf2b35ce2b1024ca497.tar.gz
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.el10
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
"The `.emacs.bmk' file used to be called this name.")
-;; defvared to avoid a compilation warning:
-(defvar bookmark-file nil
- "Old name for `bookmark-default-file'.")
-
+(define-obsolete-variable-alias 'bookmark-file 'bookmark-default-file "27.1")
(defcustom bookmark-default-file
- (if bookmark-file
- ;; In case user set `bookmark-file' in her .emacs:
- bookmark-file
- (locate-user-emacs-file "bookmarks" ".emacs.bmk"))
+ (locate-user-emacs-file "bookmarks" ".emacs.bmk")
"File in which to save bookmarks by default."
:type 'file
:group 'bookmark)