[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b65a2d1d99 6/6: Make ediff-file-remote-p obsolete in favor of fil
From: |
Stefan Kangas |
Subject: |
master b65a2d1d99 6/6: Make ediff-file-remote-p obsolete in favor of file-remote-p |
Date: |
Sun, 7 Aug 2022 08:52:35 -0400 (EDT) |
branch: master
commit b65a2d1d9992bb80c6670c11ba906e30c0f27e21
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
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.
---
lisp/vc/ediff-init.el | 4 +---
lisp/vc/ediff-ptch.el | 2 +-
lisp/vc/ediff-util.el | 6 +++---
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 6e0656ab4e..05a9901e1e 100644
--- 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 17654f80ec..94a890d95d 100644
--- 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 dd01feb1a7..fd36840db2 100644
--- 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
- master updated (4252cea163 -> b65a2d1d99), Stefan Kangas, 2022/08/07
- master c6abfb32d7 2/6: Remove workaround for XEmacs bug in ediff-util.el, Stefan Kangas, 2022/08/07
- master e672cad231 5/6: ; Improve obsoletions in ediff-init.el, Stefan Kangas, 2022/08/07
- master cf98a395d0 1/6: * lib-src/etags.c: Remove XEmacs support., Stefan Kangas, 2022/08/07
- master b65a2d1d99 6/6: Make ediff-file-remote-p obsolete in favor of file-remote-p,
Stefan Kangas <=
- master 4439a80407 3/6: Make compat function custom-reset-variables obsolete, Stefan Kangas, 2022/08/07
- master 1f4f1358e6 4/6: Declare unused function ediff-user-grabbed-mouse obsolete, Stefan Kangas, 2022/08/07