From 1342cccd4bcd606cf8fdb477e4b28001a88cc065 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 24 Nov 2018 13:48:25 +0100 Subject: [PATCH] Remove find-file-noselect in Tramp, it was handled in XEmacs * lisp/net/tramp.el (tramp-file-name-for-operation): Remove `find-file-noselect'. --- lisp/net/tramp-adb.el | 1 - lisp/net/tramp-archive.el | 1 - lisp/net/tramp-gvfs.el | 1 - lisp/net/tramp-sh.el | 1 - lisp/net/tramp-smb.el | 1 - lisp/net/tramp.el | 4 ++-- 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 00c6ad43ea1..d0cead2b887 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -141,7 +141,6 @@ It is used for TCP/IP devices." (file-truename . tramp-adb-handle-file-truename) (file-writable-p . tramp-adb-handle-file-writable-p) (find-backup-file-name . tramp-handle-find-backup-file-name) - ;; `find-file-noselect' performed by default handler. ;; `get-file-buffer' performed by default handler. (insert-directory . tramp-handle-insert-directory) (insert-file-contents . tramp-handle-insert-file-contents) diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index bb87a83f10f..47f15cef5ff 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -253,7 +253,6 @@ It must be supported by libarchive(3).") (file-truename . tramp-archive-handle-file-truename) (file-writable-p . ignore) (find-backup-file-name . ignore) - ;; `find-file-noselect' performed by default handler. ;; `get-file-buffer' performed by default handler. (insert-directory . tramp-archive-handle-insert-directory) (insert-file-contents . tramp-archive-handle-insert-file-contents) diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index fb687f0d7bd..9d53edd0843 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -569,7 +569,6 @@ It has been changed in GVFS 1.14.") (file-truename . tramp-handle-file-truename) (file-writable-p . tramp-gvfs-handle-file-writable-p) (find-backup-file-name . tramp-handle-find-backup-file-name) - ;; `find-file-noselect' performed by default handler. ;; `get-file-buffer' performed by default handler. (insert-directory . tramp-handle-insert-directory) (insert-file-contents . tramp-handle-insert-file-contents) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 4965f835b0c..462ad83317e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1023,7 +1023,6 @@ of command line.") (file-truename . tramp-sh-handle-file-truename) (file-writable-p . tramp-sh-handle-file-writable-p) (find-backup-file-name . tramp-handle-find-backup-file-name) - ;; `find-file-noselect' performed by default handler. ;; `get-file-buffer' performed by default handler. (insert-directory . tramp-sh-handle-insert-directory) (insert-file-contents . tramp-handle-insert-file-contents) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index eadb4029b54..23b5176b528 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -262,7 +262,6 @@ See `tramp-actions-before-shell' for more info.") (file-truename . tramp-handle-file-truename) (file-writable-p . tramp-smb-handle-file-writable-p) (find-backup-file-name . tramp-handle-find-backup-file-name) - ;; `find-file-noselect' performed by default handler. ;; `get-file-buffer' performed by default handler. (insert-directory . tramp-smb-handle-insert-directory) (insert-file-contents . tramp-handle-insert-file-contents) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 97f931a4a44..3fbc45f8c89 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2175,7 +2175,7 @@ ARGS are the arguments OPERATION has been called with." file-ownership-preserved-p file-readable-p file-regular-p file-remote-p file-selinux-context file-symlink-p file-truename file-writable-p - find-backup-file-name find-file-noselect get-file-buffer + find-backup-file-name get-file-buffer insert-directory insert-file-contents load make-directory make-directory-internal set-file-acl set-file-modes set-file-selinux-context set-file-times @@ -4445,7 +4445,7 @@ ALIST is of the form ((FROM . TO) ...)." It always returns a return code. The Lisp error raised when PROGRAM is nil is trapped also, returning 1. Furthermore, traces are written with verbosity of 6." - (let ((default-directory (tramp-compat-temporary-file-directory)) + (let ((default-directory (tramp-compat-temporary-file-directory)) (destination (if (eq destination t) (current-buffer) destination)) output error result) (tramp-message -- 2.39.2