Merge from origin/emacs-26

cc3ad9a ; * CONTRIBUTE: Clarify rules for committing to release branc...
a89dbe2 * doc/misc/dbus.texi (Type Conversion): Fix typo.  (Bug#33551)
03ee726 ; Add comment to `customize-package-emacs-version-alist'
bce1d1a Improve documentation of gdb-mi.el

2 files changed, 11 insertions, 5 deletions

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index ebd581b5f5a..b8684da8cf3 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -69,7 +69,11 @@
             (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))
 
-;; Tramp versions integrated into Emacs.
+;; Tramp versions integrated into Emacs.  If a user option declares a
+;; `:package-version' which doesn't belong to an integrated Tramp
+;; version, it must be added here as well (see `tramp-syntax', for
+;; example).  This can be checked by something like
+;; (customize-changed "26.1")
 (add-to-list
  'customize-package-emacs-version-alist
  '(Tramp ("2.0.55" . "22.1") ("2.0.57" . "22.2") ("2.0.58-pre" . "22.3")
@@ -78,8 +82,8 @@
          ("2.2.3-24.1" . "24.1") ("2.2.3-24.1" . "24.2") ("2.2.6-24.3" . "24.3")
          ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5")
          ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
-         ("2.2.13.25.2" . "25.3") ("2.3.3" . "26.1")
-         ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")))
+         ("2.2.13.25.2" . "25.3")
+         ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")))
 
 (add-hook 'tramp-unload-hook
           (lambda ()
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 32bdc315a42..f7928f76c84 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1120,13 +1120,15 @@ line, and no execution takes place."
 (defcustom gdb-show-changed-values t
   "If non-nil change the face of out of scope variables and changed values.
 Out of scope variables are suppressed with `shadow' face.
-Changed values are highlighted with the face `font-lock-warning-face'."
+Changed values are highlighted with the face `font-lock-warning-face'.
+Used by Speedbar."
   :type 'boolean
   :group 'gdb
   :version "22.1")
 
 (defcustom gdb-max-children 40
-  "Maximum number of children before expansion requires confirmation."
+  "Maximum number of children before expansion requires confirmation.
+Used by Speedbar."
   :type 'integer
   :group 'gdb
   :version "22.1")