[Emacs-diffs] /srv/bzr/emacs/trunk r106176: * lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to

[Juri Linkov]

------------------------------------------------------------
revno: 106176
fixes bug(s): http://debbugs.gnu.org/9364
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-24 08:56:04 +0300
message:
  * lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
  `search-whitespace-regexp' only when `isearch-regexp' is non-nil.
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-24 05:47:05 +0000
+++ b/lisp/ChangeLog    2011-10-24 05:56:04 +0000
@@ -1,5 +1,11 @@
 2011-10-24  Juri Linkov  <address@hidden>
 
+       * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
+       `search-whitespace-regexp' only when `isearch-regexp' is non-nil.
+       (Bug#9364)
+
+2011-10-24  Juri Linkov  <address@hidden>
+
        * info.el (Info-following-node-name-re): Add newline to the list
        of allowed characters for leading space.  (Bug#9824)
 

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2011-10-11 15:00:42 +0000
+++ b/lisp/isearch.el   2011-10-24 05:56:04 +0000
@@ -1452,7 +1452,7 @@
        ;; Set `search-upper-case' to nil to not call
        ;; `isearch-no-upper-case-p' in `occur-1'.
        (search-upper-case nil)
-       (search-spaces-regexp search-whitespace-regexp))
+       (search-spaces-regexp (if isearch-regexp search-whitespace-regexp)))
     (occur regexp nlines)))
 
 (declare-function hi-lock-read-face-name "hi-lock" ())