[Emacs-diffs] Changes to emacs/src/search.c

[Kim F . Storm]

Index: emacs/src/search.c
diff -c emacs/src/search.c:1.189 emacs/src/search.c:1.190
*** emacs/src/search.c:1.189    Sat Nov 20 14:04:16 2004
--- emacs/src/search.c  Sat Nov 27 01:08:45 2004
***************
*** 2860,2866 ****
        else
          {
            int from;
!           
            if (MARKERP (marker))
              {
                if (XMARKER (marker)->buffer == 0)
--- 2860,2866 ----
        else
          {
            int from;
! 
            if (MARKERP (marker))
              {
                if (XMARKER (marker)->buffer == 0)
***************
*** 2868,2882 ****
                else
                  XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer);
              }
!           
            CHECK_NUMBER_COERCE_MARKER (marker);
            from = XINT (marker);
            list = Fcdr (list);
!           
            marker = Fcar (list);
            if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
              XSETFASTINT (marker, 0);
!           
            CHECK_NUMBER_COERCE_MARKER (marker);
            search_regs.start[i] = from;
            search_regs.end[i] = XINT (marker);
--- 2868,2882 ----
                else
                  XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer);
              }
! 
            CHECK_NUMBER_COERCE_MARKER (marker);
            from = XINT (marker);
            list = Fcdr (list);
! 
            marker = Fcar (list);
            if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
              XSETFASTINT (marker, 0);
! 
            CHECK_NUMBER_COERCE_MARKER (marker);
            search_regs.start[i] = from;
            search_regs.end[i] = XINT (marker);
***************
*** 3013,3019 ****
    staticpro (&saved_last_thing_searched);
  
    DEFVAR_LISP ("search-spaces-regexp", &Vsearch_spaces_regexp,
!       /* doc: Regexp to substitute for bunches of spaces in regexp search.
  Some commands use this for user-specified regexps.
  Spaces that occur inside character classes or repetition operators
  or other such regexp constructs are not replaced with this.
--- 3013,3019 ----
    staticpro (&saved_last_thing_searched);
  
    DEFVAR_LISP ("search-spaces-regexp", &Vsearch_spaces_regexp,
!       doc: /* Regexp to substitute for bunches of spaces in regexp search.
  Some commands use this for user-specified regexps.
  Spaces that occur inside character classes or repetition operators
  or other such regexp constructs are not replaced with this.