[Emacs-diffs] /srv/bzr/emacs/trunk r111218: * net/tls.el (tls-program): Update customize type.

[Andreas Schwab]

------------------------------------------------------------
revno: 111218
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2012-12-13 10:48:54 +0100
message:
  * net/tls.el (tls-program): Update customize type.
modified:
  lisp/ChangeLog
  lisp/net/tls.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-13 09:45:54 +0000
+++ b/lisp/ChangeLog    2012-12-13 09:48:54 +0000
@@ -1,3 +1,7 @@
+2012-12-13  Andreas Schwab  <address@hidden>
+
+       * net/tls.el (tls-program): Update customize type.
+
 2012-12-13  Juanma Barranquero  <address@hidden>
 
        * emacs-lisp/edebug.el (edebug--require-cl-read): New function.

=== modified file 'lisp/net/tls.el'
--- a/lisp/net/tls.el   2012-04-19 17:20:26 +0000
+++ b/lisp/net/tls.el   2012-12-13 09:48:54 +0000
@@ -89,10 +89,14 @@
 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 @@
               (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"