[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 709478e 1/2: Prefer `customize-set-variable' in t
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-26 709478e 1/2: Prefer `customize-set-variable' in tramp.texi |
Date: |
Sun, 5 Nov 2017 14:08:18 -0500 (EST) |
branch: emacs-26
commit 709478eaa866e10a4600f8d8829ab8c79200d45e
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Prefer `customize-set-variable' in tramp.texi
* doc/misc/tramp.texi (Configuration, Default Method, Default User)
(Default Host, Remote shell setup, Auto-save and Backup)
(Ad-hoc multi-hops, Frequently Asked Questions):
Prefer `customize-set-variable' over `custom-set-variables'.
---
doc/misc/tramp.texi | 77 +++++++++++++++++++++++++----------------------------
1 file changed, 36 insertions(+), 41 deletions(-)
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 4705579..f1d9434 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -581,10 +581,7 @@ not auto loaded by Emacs. All examples require
@value{tramp} is
installed and loaded:
@lisp
address@hidden
-(custom-set-variables
- '(tramp-verbose 6 nil (tramp) "Enable remote command traces"))
address@hidden group
+(customize-set-variable 'tramp-verbose 6 "Enable remote command traces")
@end lisp
@@ -1155,7 +1152,7 @@ option to determine the default method for remote file
names that do
not have one specified.
@lisp
-(custom-set-variables '(tramp-default-method "ssh" nil (tramp)))
+(customize-set-variable 'tramp-default-method "ssh")
@end lisp
@end defopt
@@ -1242,7 +1239,7 @@ this substitution can be overridden with
@option{tramp-default-user}.
For example:
@lisp
-(custom-set-variables'(tramp-default-user "root" nil (tramp)))
+(customize-set-variable 'tramp-default-user "root")
@end lisp
@end defopt
@@ -1298,9 +1295,9 @@ follows:
@lisp
@group
(custom-set-variables
- '(tramp-default-method "ssh" nil (tramp))
- '(tramp-default-user "john" nil (tramp))
- '(tramp-default-host "target" nil (tramp)))
+ '(tramp-default-method "ssh")
+ '(tramp-default-user "john")
+ '(tramp-default-host "target"))
@end group
@end lisp
@@ -1858,21 +1855,20 @@ example below:
@lisp
@group
-(custom-set-variables
- '(tramp-password-prompt-regexp
- (concat
- "^.*"
- (regexp-opt
- '("passphrase" "Passphrase"
- ;; English
- "password" "Password"
- ;; Deutsch
- "passwort" "Passwort"
- ;; Français
- "mot de passe" "Mot de passe")
- t)
- ".*:\0? *")
- nil (tramp)))
+(customize-set-variable
+ 'tramp-password-prompt-regexp
+ (concat
+ "^.*"
+ (regexp-opt
+ '("passphrase" "Passphrase"
+ ;; English
+ "password" "Password"
+ ;; Deutsch
+ "passwort" "Passwort"
+ ;; Français
+ "mot de passe" "Mot de passe")
+ t)
+ ".*:\0? *"))
@end group
@end lisp
@@ -2175,8 +2171,8 @@ Example:
@group
(add-to-list 'backup-directory-alist
(cons "." "~/.emacs.d/backups/"))
-(custom-set-variables
- '(tramp-backup-directory-alist backup-directory-alist 6 nil (tramp)))
+(customize-set-variable
+ 'tramp-backup-directory-alist backup-directory-alist)
@end group
@end lisp
@@ -2549,7 +2545,7 @@ For ad-hoc definitions to be saved automatically in
@option{tramp-save-ad-hoc-proxies} to address@hidden
@lisp
-(custom-set-variables '(tramp-save-ad-hoc-proxies t nil (tramp)))
+(customize-set-variable 'tramp-save-ad-hoc-proxies t)
@end lisp
@end defopt
@@ -3189,10 +3185,11 @@ which allows you to set the @code{ControlPath} provided
the variable
@lisp
@group
-(setq tramp-ssh-controlmaster-options
- (concat
- "-o ControlPath=/tmp/ssh-ControlPath-%%r@@%%h:%%p "
- "-o ControlMaster=auto -o ControlPersist=yes"))
+(customize-set-variable
+ 'tramp-ssh-controlmaster-options
+ (concat
+ "-o ControlPath=/tmp/ssh-ControlPath-%%r@@%%h:%%p "
+ "-o ControlMaster=auto -o ControlPersist=yes"))
@end group
@end lisp
@@ -3205,10 +3202,7 @@ behavior, then any changes to @command{ssh} can be
suppressed with
this @code{nil} setting:
@lisp
address@hidden
-(custom-set-variables
- '(tramp-use-ssh-controlmaster-options nil nil (tramp)))
address@hidden group
+(customize-set-variable 'tramp-use-ssh-controlmaster-options nil)
@end lisp
@@ -3364,8 +3358,8 @@ You can define default methods and user names for hosts,
@lisp
@group
(custom-set-variables
- '(tramp-default-method "ssh" nil (tramp))
- '(tramp-default-user "news" nil (tramp)))
+ '(tramp-default-method "ssh")
+ '(tramp-default-user "news"))
@end group
@end lisp
@@ -3659,7 +3653,7 @@ disable such features.
Disable @value{tramp} file name completion:
@lisp
-(custom-set-variables '(ido-enable-tramp-completion nil))
+(customize-set-variable 'ido-enable-tramp-completion nil)
@end lisp
@item
@@ -3682,15 +3676,16 @@ To keep Ange FTP as default the remote files access
package, set this
in @file{.emacs}:
@lisp
-(custom-set-variables '(tramp-default-method "ftp" nil (tramp)))
+(customize-set-variable 'tramp-default-method "ftp")
@end lisp
@item
To disable both @value{tramp} (and Ange FTP), set @code{tramp-mode} to
address@hidden in @file{.emacs}.
address@hidden in @file{.emacs}. @strong{Note}, that we don't use
address@hidden, in order to avoid loading @value{tramp}.
@lisp
-(custom-set-variables '(tramp-mode nil nil (tramp)))
+(setq tramp-mode nil)
@end lisp
@item