master 6a07dc19ac6 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Michael Albinus]

branch: master
commit 6a07dc19ac65eaa3ee1eeb814af85bde7fd2c509
Merge: c0e1ff6b6b7 f70b4867598
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/net/browse-url.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 5a54d653720..ef919d4e4ed 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -520,11 +520,12 @@ down (this *won't* always work)."
 (defcustom browse-url-kde-program "kde-open"
   "The name by which to invoke the KDE web browser."
   :type 'string
-  :version "21.1")
+  :version "31.1")
 
 (defcustom browse-url-kde-args nil
   "A list of strings defining options for `browse-url-kde-program'."
-  :type '(repeat (string :tag "Argument")))
+  :type '(repeat (string :tag "Argument"))
+  :version "31.1")
 
 (defcustom browse-url-elinks-wrapper '("xterm" "-e")
   "Wrapper command prepended to the Elinks command-line."