From 83dc3f0e9b518e45bcfb0aaebcc706f79622f157 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 7 Nov 2017 20:45:58 -0500
Subject: [PATCH] * lisp/net/tramp-cmds.el, lisp/allout.el: Avoid
 custom-set-variables

* lisp/net/tramp-cmds.el (tramp-change-syntax):
* lisp/allout.el (allout-init): Avoid custom-set-variables.
---
 lisp/allout.el         | 2 +-
 lisp/cus-edit.el       | 2 +-
 lisp/net/tramp-cmds.el | 2 +-
 lisp/net/tramp.el      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/allout.el b/lisp/allout.el
index 15b7b3a8ac5..9e83a2fb2c8 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1687,7 +1687,7 @@ from what it did before, for backwards compatibility.
 MODE is the activation mode - see `allout-auto-activation' for
 valid values."
   (declare (obsolete allout-auto-activation "23.3"))
-  (custom-set-variables (list 'allout-auto-activation (format "%s" mode)))
+  (customize-set-variable 'allout-auto-activation (format "%s" mode))
   (format "%s" mode))
 
 ;;;_  > allout-setup-menubar ()
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index a87783850a3..edf3545cadd 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -986,7 +986,7 @@ If given a prefix (or a COMMENT argument), also prompt for a comment."
 				       current-prefix-arg))
   (custom-load-symbol variable)
   (custom-push-theme 'theme-value variable 'user 'set (custom-quote value))
-  (funcall (or (get variable 'custom-set) 'set-default) variable value)
+  (funcall (or (get variable 'custom-set) #'set-default) variable value)
   (put variable 'customized-value (list (custom-quote value)))
   (cond ((string= comment "")
  	 (put variable 'variable-comment nil)
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 78ef1a3ef40..37a6521680b 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -49,7 +49,7 @@ SYNTAX can be one of the symbols `default' (default),
      (unless (string-equal input "")
        (list (intern input)))))
   (when syntax
-    (custom-set-variables `(tramp-syntax ',syntax))))
+    (customize-set-variable 'tramp-syntax syntax)))
 
 (defun tramp-list-tramp-buffers ()
   "Return a list of all Tramp connection buffers."
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e300b3a58ed..a23da848112 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -670,8 +670,8 @@ It can have the following values:
   `simplified' -- Ange-FTP like syntax
   `separate'   -- Syntax as defined for XEmacs originally
 
-Do not change the value by `setq', it must be changed only by
-`custom-set-variables'.  See also `tramp-change-syntax'."
+Do not change the value by `setq', it must be changed only via
+Customize.  See also `tramp-change-syntax'."
   :group 'tramp
   :version "26.1"
   :package-version '(Tramp . "2.3.3")
-- 
2.39.5