auto upstream

2 files changed, 12 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f4eaff5797..fd6671cc29a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-13  Andreas Schwab  <schwab@suse.de>
+
+        * net/tls.el (tls-program): Update customize type.
+
 2012-12-13  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs-lisp/edebug.el (edebug--require-cl-read): New function.
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 75d178e3225..116c7e9d84a 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -89,10 +89,14 @@ Also see `tls-success' for what the program should output after
 successful negotiation."
   :type
   '(choice
+    (const :tag "Default list of commands"
+           ("gnutls-cli --insecure -p %p %h"
+            "gnutls-cli --insecure -p %p %h --protocols ssl3"
+            "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
     (list :tag "Choose commands"
           :value
-          ("gnutls-cli -p %p %h"
-           "gnutls-cli -p %p %h --protocols ssl3"
+          ("gnutls-cli --insecure -p %p %h"
+           "gnutls-cli --insecure -p %p %h --protocols ssl3"
            "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
           (set :inline t
                ;; FIXME: add brief `:tag "..."' descriptions.
@@ -102,14 +106,10 @@ successful negotiation."
                (const "gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3")
                (const "openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof")
                ;; No trust check:
-               (const "gnutls-cli -p %p %h")
-               (const "gnutls-cli -p %p %h --protocols ssl3")
+               (const "gnutls-cli --insecure -p %p %h")
+               (const "gnutls-cli --insecure -p %p %h --protocols ssl3")
                (const "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
           (repeat :inline t :tag "Other" (string)))
-    (const :tag "Default list of commands"
-           ("gnutls-cli -p %p %h"
-            "gnutls-cli -p %p %h --protocols ssl3"
-            "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
     (list :tag "List of commands"
           (repeat :tag "Command" (string))))
   :version "22.1"