diff options
| author | Juanma Barranquero | 2011-03-09 17:18:51 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-03-09 17:18:51 +0100 |
| commit | cfe0661dbe4551a93878428bc40c53adeb4864ae (patch) | |
| tree | 01da3ab55e67bc6e6a5918ab2f362c518287c409 /src | |
| parent | 114902a577327cf37d87ff297a1d874e3331d631 (diff) | |
| download | emacs-cfe0661dbe4551a93878428bc40c53adeb4864ae.tar.gz emacs-cfe0661dbe4551a93878428bc40c53adeb4864ae.zip | |
* src/search.c (compile_pattern_1): Remove unused argument.
(compile_pattern): Don't pass it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/search.c | 8 |
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 @@ | |||
| 1 | 2011-03-09 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * search.c (compile_pattern_1): Remove argument regp, unused since | ||
| 4 | revid:rms@gnu.org-19941211082627-3x1g1wyqkjmwloig. | ||
| 5 | (compile_pattern): Don't pass it. | ||
| 6 | |||
| 1 | 2011-03-08 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2011-03-08 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * xterm.h (DEFAULT_GDK_DISPLAY): New define. | 9 | * xterm.h (DEFAULT_GDK_DISPLAY): New define. |
| @@ -62,7 +68,7 @@ | |||
| 62 | text field. After disabling it, set focus on the list control. | 68 | text field. After disabling it, set focus on the list control. |
| 63 | (Fx_file_dialog): If only_dir_p is non-nil, set the text of the File | 69 | (Fx_file_dialog): If only_dir_p is non-nil, set the text of the File |
| 64 | Name text field to "Current Directory" if it does not already have | 70 | Name text field to "Current Directory" if it does not already have |
| 65 | another value. (Bug#8181) | 71 | another value. (Bug#8181) |
| 66 | 72 | ||
| 67 | 2011-03-07 Adrian Robert <Adrian.B.Robert@gmail.com> | 73 | 2011-03-07 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 68 | 74 | ||
| @@ -123,7 +129,7 @@ | |||
| 123 | * xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var. | 129 | * xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var. |
| 124 | (produce_glyphless_glyph): Make a pointer "const" | 130 | (produce_glyphless_glyph): Make a pointer "const" |
| 125 | since it might point to immutable storage. | 131 | since it might point to immutable storage. |
| 126 | (update_window_cursor): Now static, since it's not used elsewhere. | 132 | (update_window_cursor): Now static, since it's not used elsewhere. |
| 127 | (SKIP_GLYPHS): Removed unused macro. | 133 | (SKIP_GLYPHS): Removed unused macro. |
| 128 | 134 | ||
| 129 | 2011-03-06 Michael Shields <shields@msrl.com> (tiny change) | 135 | 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) | |||
| 114 | PATTERN is the pattern to compile. | 114 | PATTERN is the pattern to compile. |
| 115 | CP is the place to put the result. | 115 | CP is the place to put the result. |
| 116 | TRANSLATE is a translation table for ignoring case, or nil for none. | 116 | TRANSLATE is a translation table for ignoring case, or nil for none. |
| 117 | REGP is the structure that says where to store the "register" | ||
| 118 | values that will result from matching this pattern. | ||
| 119 | If it is 0, we should compile the pattern not to record any | ||
| 120 | subexpression bounds. | ||
| 121 | POSIX is nonzero if we want full backtracking (POSIX style) | 117 | POSIX is nonzero if we want full backtracking (POSIX style) |
| 122 | for this pattern. 0 means backtrack only enough to get a valid match. | 118 | for this pattern. 0 means backtrack only enough to get a valid match. |
| 123 | 119 | ||
| 124 | The behavior also depends on Vsearch_spaces_regexp. */ | 120 | The behavior also depends on Vsearch_spaces_regexp. */ |
| 125 | 121 | ||
| 126 | static void | 122 | static void |
| 127 | compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, Lisp_Object translate, struct re_registers *regp, int posix) | 123 | compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, Lisp_Object translate, int posix) |
| 128 | { | 124 | { |
| 129 | char *val; | 125 | char *val; |
| 130 | reg_syntax_t old; | 126 | reg_syntax_t old; |
| @@ -247,7 +243,7 @@ compile_pattern (Lisp_Object pattern, struct re_registers *regp, Lisp_Object tra | |||
| 247 | if (cp->next == 0) | 243 | if (cp->next == 0) |
| 248 | { | 244 | { |
| 249 | compile_it: | 245 | compile_it: |
| 250 | compile_pattern_1 (cp, pattern, translate, regp, posix); | 246 | compile_pattern_1 (cp, pattern, translate, posix); |
| 251 | break; | 247 | break; |
| 252 | } | 248 | } |
| 253 | } | 249 | } |