master 33cc12498b: Provide a useful default to smime-CA-file

[Lars Ingebrigtsen]

branch: master
commit 33cc12498b0f9191437d1f273d0467d0f69d48f3
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Provide a useful default to smime-CA-file
    
    * lisp/gnus/smime.el (smime-CA-file): Use `gnutls-trustfiles' to
    provide a default so that this will work automatically on many
    systems (bug#20960).
---
 lisp/gnus/smime.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index ac1e081041..87b5551d31 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -119,7 +119,7 @@
 ;;; Code:
 
 (require 'dig)
-
+(require 'gnutls)
 (require 'password-cache)
 
 (eval-when-compile (require 'cl-lib))
@@ -149,10 +149,11 @@ certificate."
   :type '(choice (const :tag "none" nil)
                 directory))
 
-(defcustom smime-CA-file nil
-  "Files containing certificates for CAs you trust.
-File should contain certificates in PEM format."
-  :version "22.1"
+(defcustom smime-CA-file (car (gnutls-trustfiles))
+  "File containing certificates for CAs you trust.
+The file should contain certificates in PEM format.  By default,
+this is initialized from the `gnutls-trusfiles' variable."
+  :version "29.1"
   :type '(choice (const :tag "none" nil)
                 file))