Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / gnus-fun.el

diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index fa78b5c6e1580ff9ba4104ae7466ff2d6984bce5..c1dd333ee50981a293f218d9f02a3a531c805d52 100644 (file)
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -28,7 +28,6 @@
   (require 'cl))
 
 (require 'mm-util)
-(require 'gnus-ems)
 (require 'gnus-util)
 (require 'gnus)
 
@@ -44,7 +43,7 @@
   "Regexp to match faces in `gnus-x-face-directory' to be omitted."
   :version "25.1"
   :group 'gnus-fun
-  :type 'string)
+  :type '(choice (const nil) string))
 
 (defcustom gnus-face-directory (expand-file-name "faces" gnus-directory)
   "*Directory where Face PNG files are stored."
@@ -56,7 +55,7 @@
   "Regexp to match faces in `gnus-face-directory' to be omitted."
   :version "25.1"
   :group 'gnus-fun
-  :type 'string)
+  :type '(choice (const nil) string))
 
 (defcustom gnus-convert-pbm-to-x-face-command "pbmtoxbm %s | compface"
   "Command for converting a PBM to an X-Face."