[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 710e79a: Fix Bug#33781
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 710e79a: Fix Bug#33781 |
Date: |
Tue, 18 Dec 2018 07:58:07 -0500 (EST) |
branch: master
commit 710e79a6c56aff69d69ae7c003346bb38c3e9939
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Fix Bug#33781
* lisp/net/tramp-cache.el (tramp-connection-properties):
* lisp/net/tramp-sh.el (tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args):
Reinsert autoload cookie. (Bug#33781)
* test/lisp/net/tramp-tests.el: Do not require tramp-sh before
changing tramp-remote-path.
---
lisp/net/tramp-cache.el | 1 +
lisp/net/tramp-sh.el | 3 +++
test/lisp/net/tramp-tests.el | 1 -
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 4706676..f525bb9 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -72,6 +72,7 @@
(defvar tramp-cache-data (make-hash-table :test 'equal)
"Hash table for remote files properties.")
+;;;###tramp-autoload
(defcustom tramp-connection-properties nil
"List of static connection properties.
Every entry has the form (REGEXP PROPERTY VALUE). The regexp
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 05715f2..e4ec735 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -466,6 +466,7 @@ The string is used in `tramp-methods'.")
;; Darwin: /usr/bin:/bin:/usr/sbin:/sbin
;; IRIX64: /usr/bin
;; QNAP QTS: ---
+;;;###tramp-autoload
(defcustom tramp-remote-path
'(tramp-default-remote-path "/bin" "/usr/bin" "/sbin" "/usr/sbin"
"/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/freeware/bin"
@@ -495,6 +496,7 @@ the list by the special value `tramp-own-remote-path'."
(const :tag "Private Directories" tramp-own-remote-path)
(string :tag "Directory"))))
+;;;###tramp-autoload
(defcustom tramp-remote-process-environment
'("ENV=''" "TMOUT=0" "LC_CTYPE=''"
"CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat"
@@ -518,6 +520,7 @@ based on the Tramp and Emacs versions, and should not be
set here."
:version "26.1"
:type '(repeat string))
+;;;###tramp-autoload
(defcustom tramp-sh-extra-args '(("/bash\\'" . "-norc -noprofile"))
"Alist specifying extra arguments to pass to the remote shell.
Entries are (REGEXP . ARGS) where REGEXP is a regular expression
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c566f81..57b67a0 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -107,7 +107,6 @@
;; This should happen on hydra only.
(when (getenv "EMACS_HYDRA_CI")
- (require 'tramp-sh)
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))
(defvar tramp--test-enabled-checked nil
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 710e79a: Fix Bug#33781,
Michael Albinus <=