procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix an Isearch var to be a string (Bug#23038)

Browse source 
* isearch.el (isearch--describe-regexp-mode): The `description' var
  needs to always be a string.  Add the missing default case for the
  cond form that ensures that.

Before this bug fix, for the events when `regexp-function' and
`search-default-mode' both were nil, `description' also stayed nil.  So
when `space-before' was non-nil, the "non-string" `description'
(with a value of nil) got passed as an argument to
`replace-regexp-in-string' (where a string was expected).  That caused
the error described in Bug#23038.
This commit is contained in:
Kaushal Modi 2016-03-22 00:28:27 +01:00 • committed by Michael Heerdegen
parent 76ef52267c
commit 91e667692b
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/isearch.el
View file

@ -2585,16 +2585,19 @@ the word mode."
(eq search-default-mode isearch-regexp))) "") (eq search-default-mode isearch-regexp))) "")
;; 2. Use the `isearch-message-prefix' set for ;; 2. Use the `isearch-message-prefix' set for
;; `regexp-function' if available. ;; `regexp-function' if available.
(regexp-function (regexp-function
(and (symbolp regexp-function) (and (symbolp regexp-function)
(or (get regexp-function 'isearch-message-prefix) (or (get regexp-function 'isearch-message-prefix)
""))) "")))
;; 3. Else if `isearch-regexp' is non-nil, set description ;; 3. Else if `isearch-regexp' is non-nil, set description
;; to "regexp ". ;; to "regexp ".
(isearch-regexp "regexp ") (isearch-regexp "regexp ")
;; 4. And finally, if we're in literal mode (and if the ;; 4. Else if we're in literal mode (and if the default
;; default mode is also not literal), describe it. ;; mode is also not literal), describe it.
((functionp search-default-mode) "literal ")))) ((functionp search-default-mode) "literal ")
;; 5. And finally, if none of the above is true, set the
;; description to an empty string.
(t ""))))
(if space-before (if space-before
;; Move space from the end to the beginning. ;; Move space from the end to the beginning.
(replace-regexp-in-string "\\(.*\\) \\'" " \\1" description) (replace-regexp-in-string "\\(.*\\) \\'" " \\1" description)