emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r116427: * lisp/apropos.el (apropos-read-pattern): F


From: Juanma Barranquero
Subject: [Emacs-diffs] trunk r116427: * lisp/apropos.el (apropos-read-pattern): Fix error message for empty string.
Date: Thu, 13 Feb 2014 05:23:15 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 116427
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-13 06:23:06 +0100
message:
  * lisp/apropos.el (apropos-read-pattern): Fix error message for empty string.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/apropos.el                apropos.el-20091113204419-o5vbwnq5f7feedwu-273
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-13 03:29:47 +0000
+++ b/lisp/ChangeLog    2014-02-13 05:23:06 +0000
@@ -1,3 +1,9 @@
+2014-02-13  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * jit-lock.el (jit-lock-mode): Keep it disabled in indirect buffers.

=== modified file 'lisp/apropos.el'
--- a/lisp/apropos.el   2014-01-06 23:34:05 +0000
+++ b/lisp/apropos.el   2014-02-13 05:23:06 +0000
@@ -370,7 +370,8 @@
         (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)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]