From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 6 Dec 2004 15:12:08 +0000 (+0000)
Subject: (isearch-quote-char): Use it.
X-Git-Tag: ttn-vms-21-2-B4~3408
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=30bb14430cc6dd9bc44a5b561e2addabc592f4b0;p=emacs.git

(isearch-quote-char): Use it.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 1057547cb3f..118d23ce38f 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1682,13 +1682,9 @@ Isearch mode."
     ;; single-byte character set, and convert them to Emacs
     ;; characters.
     (if (and isearch-regexp (= char ?\ ))
-	(if (condition-case err
-		(progn
-		  (string-match isearch-string "")
-		  nil)
-	      (error (equal (cadr err) "Unmatched [ or [^")))
-	    (isearch-process-search-char char)
-	  (isearch-process-search-string "[ ]" " "))
+	(if (subregexp-context-p isearch-string pos)
+	    (isearch-process-search-string "[ ]" " ")
+	  (isearch-process-search-char char))
       (and enable-multibyte-characters
 	   (>= char ?\200)
 	   (<= char ?\377)