master 0c106ce87c 3/6: Fix namespace problem in saveplace.el

[Stefan Kangas]

branch: master
commit 0c106ce87ced346dc7280a0c9943b0e2e6dd8c37
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Fix namespace problem in saveplace.el
    
    * lisp/saveplace.el (save-place-load-alist-from-file): Rename from
    'load-save-place-alist-from-file'.  Retain old name as an obsolete
    alias.  Update callers.
---
 lisp/saveplace.el            | 11 +++++++----
 test/lisp/saveplace-tests.el |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 3830e4b16c..4b13331312 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -191,7 +191,7 @@ file names."
   ;; First check to make sure alist has been loaded in from the master
   ;; file.  If not, do so, then feel free to modify the alist.  It
   ;; will be saved again when Emacs is killed.
-  (or save-place-loaded (load-save-place-alist-from-file))
+  (or save-place-loaded (save-place-load-alist-from-file))
   (let* ((directory (and (derived-mode-p 'dired-mode)
                          (boundp 'dired-subdir-alist)
                         dired-subdir-alist
@@ -278,7 +278,7 @@ may have changed) back to `save-place-alist'."
          (file-error (message "Saving places: can't write %s" file)))
         (kill-buffer (current-buffer))))))
 
-(defun load-save-place-alist-from-file ()
+(defun save-place-load-alist-from-file ()
   (if (not save-place-loaded)
       (progn
         (setq save-place-loaded t)
@@ -352,7 +352,7 @@ may have changed) back to `save-place-alist'."
 (defun save-place-find-file-hook ()
   "Function added to `find-file-hook' by `save-place-mode'.
 It runs the hook `save-place-after-find-file-hook'."
-  (or save-place-loaded (load-save-place-alist-from-file))
+  (or save-place-loaded (save-place-load-alist-from-file))
   (let ((cell (assoc buffer-file-name save-place-alist)))
     (if cell
        (progn
@@ -367,7 +367,7 @@ It runs the hook `save-place-after-find-file-hook'."
 
 (defun save-place-dired-hook ()
   "Position the point in a Dired buffer."
-  (or save-place-loaded (load-save-place-alist-from-file))
+  (or save-place-loaded (save-place-load-alist-from-file))
   (let* ((directory (and (derived-mode-p 'dired-mode)
                          (boundp 'dired-subdir-alist)
                         dired-subdir-alist
@@ -396,5 +396,8 @@ It runs the hook `save-place-after-find-file-hook'."
   (if save-place-loaded
       (save-place-alist-to-file)))
 
+(define-obsolete-function-alias 'load-save-place-alist-from-file
+  #'save-place-load-alist-from-file "29.1")
+
 (provide 'saveplace)
 ;;; saveplace.el ends here
diff --git a/test/lisp/saveplace-tests.el b/test/lisp/saveplace-tests.el
index 6f66f3fa34..99318d295d 100644
--- a/test/lisp/saveplace-tests.el
+++ b/test/lisp/saveplace-tests.el
@@ -84,7 +84,7 @@
         (save-place-file
          (ert-resource-file "saveplace"))
         (save-place-alist nil))
-    (load-save-place-alist-from-file)
+    (save-place-load-alist-from-file)
     (should (equal save-place-alist
                    '(("/home/skangas/.emacs.d/cache/recentf" . 1306)
                      ("/home/skangas/wip/emacs/"