isearch magic space

isearch magic space

[Chong Yidong]

Some time ago, I proposed providing a magic space for ordinary isearch. 
The response was generally favorable, but my papers were not in order, so
the patch could not be applied.  My copyright assignment is settled now;
can the patch be applied, or is it too late?



*** emacs/lisp/isearch.el~	Tue Mar 15 19:06:42 2005
--- emacs/lisp/isearch.el	Tue Mar 15 19:15:49 2005
***************
*** 109,114 ****
--- 109,123 ----
    :type 'boolean
    :group 'isearch)

+ (defcustom search-string-whitespace-regexp "[ \t\r\n]+"
+   "*If non-nil, regular expression to match a sequence of whitespace chars.
+ This applies to ordinary (string) incremental search.  When you
+ put a space or spaces in the incremental regexp, it stands for
+ this, unless it is inside of a regexp construct such as [...]
+ or *, + or ?."
+   :type 'regexp
+   :group 'isearch)
+
  (defcustom search-whitespace-regexp "\\s-+"
    "*If non-nil, regular expression to match a sequence of whitespace chars.
  This applies to regular expression incremental search.
***************
*** 2027,2033 ****
       (isearch-regexp
        (if isearch-forward 're-search-forward 're-search-backward))
       (t
!       (if isearch-forward 'search-forward 'search-backward)))))

  (defun isearch-search ()
    ;; Do the search with the current search string.
--- 2036,2051 ----
       (isearch-regexp
        (if isearch-forward 're-search-forward 're-search-backward))
       (t
!       (if isearch-forward
!           'isearch-search-forward 'isearch-search-backward)))))
!
! (defun isearch-search-forward (string &optional bound noerror count)
!   (let ((search-spaces-regexp search-string-whitespace-regexp))
!     (re-search-forward (regexp-quote string) bound noerror count)))
!
! (defun isearch-search-backward (string &optional bound noerror count)
!   (let ((search-spaces-regexp search-string-whitespace-regexp))
!     (re-search-backward (regexp-quote string) bound noerror count)))

  (defun isearch-search ()
    ;; Do the search with the current search string.

Re: isearch magic space

[Juri Linkov]

"Chong Yidong" <cyd@stupidchicken.com> writes:
> Some time ago, I proposed providing a magic space for ordinary isearch. 
> The response was generally favorable, but my papers were not in order, so
> the patch could not be applied.  My copyright assignment is settled now;
> can the patch be applied, or is it too late?

I like the idea of using a space to match any whitespace in plain
non-regexp isearch.  However, it should be nil by default to preserve
the default behavior for users who don't expect such a change.
Also there should be an easy way to put a literal space into the
search string.  In regexp isearch this can be done with C-q SPC.

One solution is to allow `search-whitespace-regexp' to be a list of
regexps and a new key could rotate this list and search will use
the first element.  I noticed that in most cases as the whitespace
regexp "\\W+" is more useful than "\\s-+".  So a new key could use
the default values '(nil "\\s-+" "\\W+") and switch between them.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: isearch magic space

[Chong Yidong]

> I like the idea of using a space to match any whitespace in plain
> non-regexp isearch.  However, it should be nil by default to preserve
> the default behavior for users who don't expect such a change.

That is fine.

> Also there should be an easy way to put a literal space into the
> search string.  In regexp isearch this can be done with C-q SPC.

It is actually easy to extend this to string search, by making an
additional small tweak to isearch-quote-char:

*** 1768,1774 ****
      ;; Assume character codes 0200 - 0377 stand for characters in some
      ;; single-byte character set, and convert them to Emacs
      ;; characters.
!     (if (and isearch-regexp (= char ?\ ))
  	(if (subregexp-context-p isearch-string (length isearch-string))
  	    (isearch-process-search-string "[ ]" " ")
  	  (isearch-process-search-char char))
--- 1777,1783 ----
      ;; Assume character codes 0200 - 0377 stand for characters in some
      ;; single-byte character set, and convert them to Emacs
      ;; characters.
!     (if (and (not isearch-word) (= char ?\ ))
  	(if (subregexp-context-p isearch-string (length isearch-string))
  	    (isearch-process-search-string "[ ]" " ")
  	  (isearch-process-search-char char))

Re: isearch magic space

[Chong Yidong]

>> Also there should be an easy way to put a literal space into the
>> search string.  In regexp isearch this can be done with C-q SPC.
>
> It is actually easy to extend this to string search, by making an
> additional small tweak to isearch-quote-char:

Whoops.  This won't work, because using regexp-quote negates it.  Sorry.

Re: isearch magic space

[Miles Bader]

On Tue, 15 Mar 2005 06:14:13 -0500 (EST), Chong Yidong
<cyd@stupidchicken.com> wrote:
> Some time ago, I proposed providing a magic space for ordinary isearch.
> The response was generally favorable, but my papers were not in order, so
> the patch could not be applied.  My copyright assignment is settled now;
> can the patch be applied, or is it too late?

Whatever the case, I think it should default to off.

-miles
-- 
Do not taunt Happy Fun Ball.