summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog10
-rw-r--r--src/search.c8
2 files changed, 10 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ff5ee064a92..c9133f2ea86 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-09 Juanma Barranquero <lekktu@gmail.com>
+
+ * search.c (compile_pattern_1): Remove argument regp, unused since
+ revid:rms@gnu.org-19941211082627-3x1g1wyqkjmwloig.
+ (compile_pattern): Don't pass it.
+
2011-03-08 Jan Djärv <jan.h.d@swipnet.se>
* xterm.h (DEFAULT_GDK_DISPLAY): New define.
@@ -62,7 +68,7 @@
text field. After disabling it, set focus on the list control.
(Fx_file_dialog): If only_dir_p is non-nil, set the text of the File
Name text field to "Current Directory" if it does not already have
- another value. (Bug#8181)
+ another value. (Bug#8181)
2011-03-07 Adrian Robert <Adrian.B.Robert@gmail.com>
@@ -123,7 +129,7 @@
* xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var.
(produce_glyphless_glyph): Make a pointer "const"
since it might point to immutable storage.
- (update_window_cursor): Now static, since it's not used elsewhere.
+ (update_window_cursor): Now static, since it's not used elsewhere.
(SKIP_GLYPHS): Removed unused macro.
2011-03-06 Michael Shields <shields@msrl.com> (tiny change)
diff --git a/src/search.c b/src/search.c
index 1e2036f6dc2..dceff94da72 100644
--- a/src/search.c
+++ b/src/search.c
@@ -114,17 +114,13 @@ matcher_overflow (void)
PATTERN is the pattern to compile.
CP is the place to put the result.
TRANSLATE is a translation table for ignoring case, or nil for none.
- REGP is the structure that says where to store the "register"
- values that will result from matching this pattern.
- If it is 0, we should compile the pattern not to record any
- subexpression bounds.
POSIX is nonzero if we want full backtracking (POSIX style)
for this pattern. 0 means backtrack only enough to get a valid match.
The behavior also depends on Vsearch_spaces_regexp. */
static void
-compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, Lisp_Object translate, struct re_registers *regp, int posix)
+compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, Lisp_Object translate, int posix)
{
char *val;
reg_syntax_t old;
@@ -247,7 +243,7 @@ compile_pattern (Lisp_Object pattern, struct re_registers *regp, Lisp_Object tra
if (cp->next == 0)
{
compile_it:
- compile_pattern_1 (cp, pattern, translate, regp, posix);
+ compile_pattern_1 (cp, pattern, translate, posix);
break;
}
}