aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-11-27 01:09:08 +0000
committerKim F. Storm2004-11-27 01:09:08 +0000
commite281182817bc5db0bc276861e19081254c2ddf51 (patch)
tree3c4002fc03058b4978ac31d9ac6585e658cf2a38 /src
parent443b961aee995e86bdc196b2d26a9946c01a2f6a (diff)
downloademacs-e281182817bc5db0bc276861e19081254c2ddf51.tar.gz
emacs-e281182817bc5db0bc276861e19081254c2ddf51.zip
(syms_of_search) <search-spaces-regexp>: Move 'doc:'
marker out of doc string.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/search.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 32d8a64d43f..1885f8fc894 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-11-27 Kim F. Storm <storm@cua.dk>
2
3 * search.c (syms_of_search) <search-spaces-regexp>: Move 'doc:'
4 marker out of doc string.
5
12004-11-26 Stefan Monnier <monnier@iro.umontreal.ca> 62004-11-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * s/darwin.h (POSIX_SIGNALS): Undo the removal of 2002-08-25, 8 * s/darwin.h (POSIX_SIGNALS): Undo the removal of 2002-08-25,
diff --git a/src/search.c b/src/search.c
index 56611ca7af8..7e990f2bfd7 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2860,7 +2860,7 @@ LIST should have been created by calling `match-data' previously. */)
2860 else 2860 else
2861 { 2861 {
2862 int from; 2862 int from;
2863 2863
2864 if (MARKERP (marker)) 2864 if (MARKERP (marker))
2865 { 2865 {
2866 if (XMARKER (marker)->buffer == 0) 2866 if (XMARKER (marker)->buffer == 0)
@@ -2868,15 +2868,15 @@ LIST should have been created by calling `match-data' previously. */)
2868 else 2868 else
2869 XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer); 2869 XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer);
2870 } 2870 }
2871 2871
2872 CHECK_NUMBER_COERCE_MARKER (marker); 2872 CHECK_NUMBER_COERCE_MARKER (marker);
2873 from = XINT (marker); 2873 from = XINT (marker);
2874 list = Fcdr (list); 2874 list = Fcdr (list);
2875 2875
2876 marker = Fcar (list); 2876 marker = Fcar (list);
2877 if (MARKERP (marker) && XMARKER (marker)->buffer == 0) 2877 if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
2878 XSETFASTINT (marker, 0); 2878 XSETFASTINT (marker, 0);
2879 2879
2880 CHECK_NUMBER_COERCE_MARKER (marker); 2880 CHECK_NUMBER_COERCE_MARKER (marker);
2881 search_regs.start[i] = from; 2881 search_regs.start[i] = from;
2882 search_regs.end[i] = XINT (marker); 2882 search_regs.end[i] = XINT (marker);
@@ -3013,7 +3013,7 @@ syms_of_search ()
3013 staticpro (&saved_last_thing_searched); 3013 staticpro (&saved_last_thing_searched);
3014 3014
3015 DEFVAR_LISP ("search-spaces-regexp", &Vsearch_spaces_regexp, 3015 DEFVAR_LISP ("search-spaces-regexp", &Vsearch_spaces_regexp,
3016 /* doc: Regexp to substitute for bunches of spaces in regexp search. 3016 doc: /* Regexp to substitute for bunches of spaces in regexp search.
3017Some commands use this for user-specified regexps. 3017Some commands use this for user-specified regexps.
3018Spaces that occur inside character classes or repetition operators 3018Spaces that occur inside character classes or repetition operators
3019or other such regexp constructs are not replaced with this. 3019or other such regexp constructs are not replaced with this.