Don't expand file names for non-existing remote connections

* lisp/saveplace.el (save-place-abbreviate-file-names) [:set]:
* lisp/bookmark.el (bookmark--remove-fringe-mark): Don't expand
file names for non-existing remote connections.  (Bug#66982)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 10ff2f5ebbfd4604e636e7b2127bdfbc609a5db5..71d76cb4291c4ced2fc28f918e1b62ec6cdc1e9e 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -511,6 +511,8 @@ BM is a bookmark as returned from function `bookmark-get-bookmark'.
 See user option `bookmark-fringe-mark'."
   (let ((filename (cdr (assq 'filename bm)))
         (pos (cdr (assq 'position bm)))
+        ;; Don't expand file names for non-existing remote connections.
+        (non-essential t)
         overlays found temp)
     (when (and pos filename)
       (setq filename (expand-file-name filename))

diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 590c55d26092cd4e875fb9fe3c48ad2be192b3b8..1330d00f10a33e8b02ccc6377dfa7048aebc9dc4 100644 (file)
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -156,7 +156,9 @@ either `setopt' or M-x customize-variable to set this option."
   :set (lambda (sym val)
          (set-default sym val)
          (or save-place-loaded (save-place-load-alist-from-file))
-         (let ((fun (if val #'abbreviate-file-name #'expand-file-name)))
+         (let ((fun (if val #'abbreviate-file-name #'expand-file-name))
+               ;; Don't expand file names for non-existing remote connections.
+               (non-essential t))
            (setq save-place-alist
                  (cl-delete-duplicates
                   (cl-loop for (k . v) in save-place-alist