diff options
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index dd01feb1a7c..fd36840db25 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 |