aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus2019-10-20 13:10:12 +0200
committerMichael Albinus2019-10-20 13:10:12 +0200
commit0cbcd2869e46f2ede0d08fd183d6c0ad0ebd8394 (patch)
treec454a1fd821d520e43cc58d91a6f4ae0d666bd8e /lisp/net
parentbee7beee8efa6557c11aaa7c0e8e63885411d387 (diff)
downloademacs-0cbcd2869e46f2ede0d08fd183d6c0ad0ebd8394.tar.gz
emacs-0cbcd2869e46f2ede0d08fd183d6c0ad0ebd8394.zip
Fix docstrings in tramp.el
* lisp/net/tramp.el (tramp-antispoof-regexp) (tramp-file-name-handler): Fix docstring.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 37f34cf002b..97fcf553010 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -638,11 +638,12 @@ The answer will be provided by `tramp-action-terminal', which see."
638 638
639;; Plink 0.71 has added an additional anti-spoofing prompt after 639;; Plink 0.71 has added an additional anti-spoofing prompt after
640;; authentication. This could be discarded with the argument 640;; authentication. This could be discarded with the argument
641;; \"-no-antispoof\". However, since we don't know which PuTTY 641;; "-no-antispoof". However, since we don't know which PuTTY
642;; version is installed, we must react interactively. 642;; version is installed, we must react interactively.
643(defcustom tramp-antispoof-regexp 643(defcustom tramp-antispoof-regexp
644 (regexp-quote "Access granted. Press Return to begin session. ") 644 (regexp-quote "Access granted. Press Return to begin session. ")
645 "Regular expression matching plink's anti-spoofing message." 645 "Regular expression matching plink's anti-spoofing message.
646The regexp should match at end of buffer."
646 :version "27.1" 647 :version "27.1"
647 :type 'regexp) 648 :type 'regexp)
648 649
@@ -2261,7 +2262,7 @@ preventing reentrant calls of Tramp.")
2261;; Main function. 2262;; Main function.
2262(defun tramp-file-name-handler (operation &rest args) 2263(defun tramp-file-name-handler (operation &rest args)
2263 "Invoke Tramp file name handler. 2264 "Invoke Tramp file name handler.
2264Falls back to normal file name handler if no Tramp file name handler exists." 2265Fall back to normal file name handler if no Tramp file name handler exists."
2265 (let ((filename (apply #'tramp-file-name-for-operation operation args)) 2266 (let ((filename (apply #'tramp-file-name-for-operation operation args))
2266 ;; `file-remote-p' is called for everything, even for symbolic 2267 ;; `file-remote-p' is called for everything, even for symbolic
2267 ;; links which look remote. We don't want to get an error. 2268 ;; links which look remote. We don't want to get an error.