Improve pcmpl-rpm-query-options custom type

diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index 12fce3638049a5cacb621a21fdcc91a6b7ba3533..4afda82ff91cec368b3d545a38e00ed0613e5b85 100644 (file)
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -43,9 +43,11 @@
         (if (search-forward "--nosignature " nil t)
             (push "--nosignature" opts))))
     opts)
-  "List of extra options to add to an rpm query command."
+  "String, or list of strings, with extra options for an rpm query command."
   :version "24.2"
-  :type '(repeat string)
+  :type '(choice (const :tag "No options" nil)
+                 (string :tag "Single option")
+                 (repeat :tag "List of options" string))
   :group 'pcmpl-rpm)
 
 (defcustom pcmpl-rpm-cache t
@@ -78,7 +80,9 @@
           pcmpl-rpm-packages
           (split-string (apply 'pcomplete-process-result "rpm"
                                (append '("-q" "-a")
-                                       pcmpl-rpm-query-options))))))
+                                       (if (stringp pcmpl-rpm-query-options)
+                                           (list pcmpl-rpm-query-options)
+                                         pcmpl-rpm-query-options)))))))
 
 ;; Should this use pcmpl-rpm-query-options?
 ;; I don't think it would speed it up at all (?).