3 files changed, 54 insertions, 42 deletions

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index c90f6d06bf6..13f5c81d949 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -1760,6 +1760,7 @@ file.  For commands that you can use to view the effect of your changes,
 see @ref{Indentation Commands} and @ref{Filling and Breaking}.
 
 For details of the @ccmode{} style system, see @ref{Styles}.
+
 @item @kbd{C-c :} (@code{c-scope-operator})
 @kindex C-c :
 @findex c-scope-operator
@@ -1768,6 +1769,18 @@ In C++, it is also sometimes desirable to insert the double-colon scope
 operator without performing the electric behavior of colon insertion.
 @kbd{C-c :} does just this.
 
+@item @kbd{C-c C-z} (@code{c-display-defun-name})
+@kindex C-c C-z
+@findex c-display-defun-name
+@findex display-defun-name (c-)
+Display the current function name, if any, in the minibuffer.
+Additionally, if a prefix argument is given, push the function name to
+the kill ring.  If there is no current function,
+@code{c-display-defun-name} does nothing.  In Emacs, you can use this
+command in the middle of an interactive search if you set the
+customizable option @code{isearch-allow-scroll} to non-@code{nil}.
+@xref{Not Exiting Isearch,,,emacs, GNU Emacs Manual}.
+
 @item @kbd{C-c C-\} (@code{c-backslash-region})
 @kindex C-c C-\
 @findex c-backslash-region
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 0ad48b0b9ec..92846a924c5 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -94,7 +94,11 @@ There's one way to find out if GnuTLS is available, by calling
 Zaretskii) in the same directory as Emacs, you should be OK.
 
 @defun gnutls-available-p
-This function returns @code{t} if GnuTLS is available in this instance of Emacs.
+This function returns non-@code{nil} if GnuTLS is available in this
+instance of Emacs, @code{nil} otherwise.  If GnuTLS is available, the
+value is a list of GnuTLS capabilities supported by the installed
+GnuTLS library, which depends on the library version.  The meaning of
+the capabilities is documented in the doc string of this function.
 @end defun
 
 Oh, but sometimes things go wrong.  Budgets aren't balanced,
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 47055793b73..f1d9434bf72 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
-@group
-(custom-set-variables
- '(tramp-verbose 6 nil (tramp) "Enable remote command traces"))
-@end 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 non-@code{nil}.
 
 @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
-@group
-(custom-set-variables
- '(tramp-use-ssh-controlmaster-options nil nil (tramp)))
-@end 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
-@code{nil} in @file{.emacs}.
+@code{nil} in @file{.emacs}.  @strong{Note}, that we don't use
+@code{customize-set-variable}, in order to avoid loading @value{tramp}.
 
 @lisp
-(custom-set-variables '(tramp-mode nil nil (tramp)))
+(setq tramp-mode nil)
 @end lisp
 
 @item