X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/85ca47671ccbffe87d6ccad17039b49d6b676d61..374c21d59a3e2b8a49c7e4ecc466edb5313dbb98:/lisp/gnus/gnus-fun.el

diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index ca14dd0b6d..c1dd333ee5 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -1,6 +1,6 @@
 ;;; gnus-fun.el --- various frivolous extension functions to Gnus
 
-;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -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."
@@ -265,7 +264,7 @@ colors of the displayed X-Faces."
 	  (article-narrow-to-head)
 	  (gnus-article-goto-header "from")
 	  (when (bobp)
-	    (insert "From: [no `from' set]\n")
+	    (insert "From: [no 'from' set]\n")
 	    (forward-char -17))
 	  (gnus-add-image
 	   'xface