[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master abe18f5: Make bookmark-old-default-file variable ob
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master abe18f5: Make bookmark-old-default-file variable obsolete |
Date: |
Sun, 9 Jun 2019 19:48:04 -0400 (EDT) |
branch: master
commit abe18f5917d95ca2a27018ce5dfc01ac91fc9fab
Author: Stefan Kangas <address@hidden>
Commit: Paul Eggert <address@hidden>
Make bookmark-old-default-file variable obsolete
* lisp/bookmark.el (bookmark-old-default-file):
Redefine as obsolete variable alias for 'bookmark-default-file'.
(bookmark-maybe-load-default-file): Don't try to rename file
'bookmark-old-default-file' (~/.emacs-bkmrks) to new name (Bug#35940).
---
etc/NEWS | 6 ++++++
lisp/bookmark.el | 15 ++-------------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 22b86b5..c9da98b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1513,6 +1513,12 @@ buffer periodically when 'auto-revert-avoid-polling' is
non-nil.
*** 'bookmark-file' is now an obsolete alias of
'bookmark-default-file'.
+** Bookmarks
+
+---
+*** 'bookmark-old-default-file' is now an obsolete alias of
+'bookmark-default-file'.
+
* New Modes and Packages in Emacs 27.1
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 0088450..5a9859d 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -78,8 +78,8 @@ To specify the file in which to save them, modify the variable
:group 'bookmark)
-(defconst bookmark-old-default-file "~/.emacs-bkmrks"
- "The `.emacs.bmk' file used to be called this name.")
+(define-obsolete-variable-alias 'bookmark-old-default-file
+ 'bookmark-default-file "27.1")
(define-obsolete-variable-alias 'bookmark-file 'bookmark-default-file "27.1")
@@ -1024,17 +1024,6 @@ it to the name of the bookmark currently being set,
advancing
"If bookmarks have not been loaded from the default place, load them."
(and (not bookmarks-already-loaded)
(null bookmark-alist)
- (prog2
- (and
- ;; Possibly the old bookmark file, "~/.emacs-bkmrks", needs
- ;; to be renamed.
- (file-exists-p bookmark-old-default-file)
- (not (file-exists-p bookmark-default-file))
- (rename-file bookmark-old-default-file
- bookmark-default-file))
- ;; return t so the `and' will continue...
- t)
-
(file-readable-p bookmark-default-file)
(bookmark-load bookmark-default-file t t)
(setq bookmarks-already-loaded t)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master abe18f5: Make bookmark-old-default-file variable obsolete,
Paul Eggert <=