* lisp/apropos.el (apropos-read-pattern): Fix error message for empty string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19df506e3a14e95d72fca43d3c8c9d942f4d1717..d5c0f6aa552f71646bcef38e69883cbd52c273ab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * apropos.el (apropos-read-pattern): When the user passes an empty
+       string, give a more helpful error message than "Wrong type
+       argument: stringp, nil".
+
 2014-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * jit-lock.el (jit-lock-mode): Keep it disabled in indirect buffers.

diff --git a/lisp/apropos.el b/lisp/apropos.el
index f24871d5d20300bcc8492cff92c8191e21b2c4ea..93e2e42ee9b6881c096e5e6a7eb0facc323bd8dd 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -370,7 +370,8 @@ kind of objects to search."
         (read-string (concat "Search for " subject " (word list or regexp): "))))
     (if (string-equal (regexp-quote pattern) pattern)
        ;; Split into words
-       (split-string pattern "[ \t]+" t)
+       (or (split-string pattern "[ \t]+" t)
+           (user-error "No word list given"))
       pattern)))
 
 (defun apropos-parse-pattern (pattern)