; Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 62b18b4045385d0070b51c5abe3e0a8917d847ca..1b0acd24030b1cbdd7a3264265a48d7b3205c3ae 100644 (file)
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -1,6 +1,6 @@
 ;;; gnus-picon.el --- displaying pretty icons in Gnus
 
-;; Copyright (C) 1996-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news xpm annotation glyph faces
@@ -73,7 +73,7 @@ Some people may want to add \"unknown\" to this list."
 
 (defcustom gnus-picon-properties '(:color-symbols (("None" . "white")))
   "List of image properties applied to picons."
-  :type 'sexp
+  :type 'plist
   :version "24.3"
   :group 'gnus-picon)
 
@@ -81,7 +81,6 @@ Some people may want to add \"unknown\" to this list."
   "How should picons be displayed.
 If `inline', the textual representation is replaced.  If `right', picons are
 added right to the textual representation."
-  ;; FIXME: `right' needs improvement for XEmacs.
   :type '(choice (const inline)
                 (const right))
   :group 'gnus-picon)