aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc/ediff-diff.el
diff options
context:
space:
mode:
authorMichael Albinus2016-11-20 16:29:47 +0100
committerMichael Albinus2016-11-20 16:29:47 +0100
commit22946702b4296c0e42e4baf6221e205b52d05cbf (patch)
treea81e506e5176351677c8f677e32cde6236d1b070 /lisp/vc/ediff-diff.el
parent26c45889259682af0fbf05bccf7f084408860125 (diff)
downloademacs-22946702b4296c0e42e4baf6221e205b52d05cbf.tar.gz
emacs-22946702b4296c0e42e4baf6221e205b52d05cbf.zip
Add file-local-name
* doc/lispref/files.texi (Magic File Names): Add `file-local-name'. (Unique File Names): Use it. * etc/NEWS: Mention `file-local-name'. * lisp/files.el (file-local-name): New defun. (file-expand-wildcards): * lisp/eshell/em-tramp.el (eshell/su, eshell/sudo): * lisp/eshell/esh-ext.el (eshell-remote-command): * lisp/eshell/esh-proc.el (eshell-gather-process-output): * lisp/org/ob-core.el (org-babel-local-file-name): * lisp/progmodes/gud.el (gud-common-init, gud-format-command): * lisp/progmodes/python.el (python-shell-send-file): * lisp/shell.el (shell): * lisp/vc/ediff-diff.el (ediff-same-file-contents): * lisp/vc/vc-git.el (vc-git-checkin): Use it.
Diffstat (limited to 'lisp/vc/ediff-diff.el')
-rw-r--r--lisp/vc/ediff-diff.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index b1ac32d7019..56bfebb579c 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1347,10 +1347,8 @@ arguments to `skip-chars-forward'."
1347 ;; located on the same remote host. 1347 ;; located on the same remote host.
1348 (apply 'process-file ediff-cmp-program nil nil nil 1348 (apply 'process-file ediff-cmp-program nil nil nil
1349 (append ediff-cmp-options 1349 (append ediff-cmp-options
1350 (list (or (file-remote-p f1 'localname) 1350 (list (expand-file-name (file-local-name f1))
1351 (expand-file-name f1)) 1351 (expand-file-name (file-local-name f2)))))
1352 (or (file-remote-p f2 'localname)
1353 (expand-file-name f2)))))
1354 )) 1352 ))
1355 (and (numberp res) (eq res 0))) 1353 (and (numberp res) (eq res 0)))
1356 1354