Make ediff-file-remote-p obsolete in favor of file-remote-p

* lisp/vc/ediff-init.el (ediff-file-remote-p): Make into obsolete
function alias for file-remote-p.  Update callers.

diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 6e0656ab4e2c17ca10cb245436b7a3d1c8a8975e..05a9901e1e4c7094c4459791021f270102436658 100644 (file)
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -1272,9 +1272,6 @@ This default should work without changes."
   "Temporary file used for refining difference regions in buffer C.")
 
 
-(defun ediff-file-remote-p (file-name)
-  (file-remote-p file-name))
-
 ;; File for which we can get attributes, such as size or date
 (defun ediff-listable-file (file-name)
   (let ((handler (find-file-name-handler file-name 'file-local-copy)))
@@ -1564,6 +1561,7 @@ This default should work without changes."
 (define-obsolete-function-alias 'ediff-with-syntax-table #'with-syntax-table "27.1")
 (define-obsolete-function-alias 'ediff-convert-standard-filename #'convert-standard-filename "28.1")
 (define-obsolete-function-alias 'ediff-hide-face #'ignore "28.1")
+(define-obsolete-function-alias 'ediff-file-remote-p #'file-remote-p "29.1")
 
 (provide 'ediff-init)
 ;;; ediff-init.el ends here

diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 17654f80ec7d91c7e20417f7e0177cb57287422c..94a890d95d5041562d047bb8df128ab9f3e77b5e 100644 (file)
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -798,7 +798,7 @@ you can still examine the changes via M-x ediff-files"
       ;; the orig file.
       (setq target-filename
            (concat
-            (if (ediff-file-remote-p (file-truename source-filename))
+             (if (file-remote-p (file-truename source-filename))
                 magic-file-name
               source-filename)
             "_patched"))

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index dd01feb1a7c8912ff4a2efb48cc8801eb21b4c93..fd36840db25fb20e6fb12d781e1155658857cf03 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3273,7 +3273,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
 
 (defun ediff-filename-magic-p (file)
   (or (ediff-file-compressed-p file)
-      (ediff-file-remote-p file)))
+      (file-remote-p file)))
 
 
 (defun ediff-save-buffer (arg)
@@ -3394,11 +3394,11 @@ Without an argument, it saves customized diff argument, if available
        file-A file-B)
     (unless (and buf-A-file-name
                 (file-exists-p buf-A-file-name)
-                (not (ediff-file-remote-p buf-A-file-name)))
+                 (not (file-remote-p buf-A-file-name)))
       (setq file-A (ediff-make-temp-file ediff-buffer-A)))
     (unless (and buf-B-file-name
                 (file-exists-p buf-B-file-name)
-                (not (ediff-file-remote-p buf-B-file-name)))
+                 (not (file-remote-p buf-B-file-name)))
       (setq file-B (ediff-make-temp-file ediff-buffer-B)))
     (or (ediff-buffer-live-p ediff-custom-diff-buffer)
        (setq ediff-custom-diff-buffer