diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-08-20 07:34:41 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-08-20 07:34:41 -0600 |
| commit | 49bc1a9dfc6e81a370bf12157c3c573743ee200a (patch) | |
| tree | 24df8b040aff367adc11a2c676334ec238651e1d /src/search.c | |
| parent | b94de893429bbfbb27572c8c3118fcc876957adb (diff) | |
| parent | a05731a0cc2553af0469bd9b7d6ac10cd2e6a817 (diff) | |
| download | emacs-49bc1a9dfc6e81a370bf12157c3c573743ee200a.tar.gz emacs-49bc1a9dfc6e81a370bf12157c3c573743ee200a.tar.bz2 emacs-49bc1a9dfc6e81a370bf12157c3c573743ee200a.zip | |
Merge from trunk
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/search.c b/src/search.c index 5df01f664f7..dac1a8d4dfc 100644 --- a/src/search.c +++ b/src/search.c @@ -278,8 +278,8 @@ looking_at_1 (Lisp_Object string, int posix) save_search_regs (); /* This is so set_image_of_range_1 in regex.c can find the EQV table. */ - XCHAR_TABLE (BVAR (current_buffer, case_canon_table))->extras[2] - = BVAR (current_buffer, case_eqv_table); + set_char_table_extras (BVAR (current_buffer, case_canon_table), 2, + BVAR (current_buffer, case_eqv_table)); CHECK_STRING (string); bufp = compile_pattern (string, @@ -393,8 +393,8 @@ string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start, int p } /* This is so set_image_of_range_1 in regex.c can find the EQV table. */ - XCHAR_TABLE (BVAR (current_buffer, case_canon_table))->extras[2] - = BVAR (current_buffer, case_eqv_table); + set_char_table_extras (BVAR (current_buffer, case_canon_table), 2, + BVAR (current_buffer, case_eqv_table)); bufp = compile_pattern (regexp, (NILP (Vinhibit_changing_match_data) @@ -990,8 +990,8 @@ search_command (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror, } /* This is so set_image_of_range_1 in regex.c can find the EQV table. */ - XCHAR_TABLE (BVAR (current_buffer, case_canon_table))->extras[2] - = BVAR (current_buffer, case_eqv_table); + set_char_table_extras (BVAR (current_buffer, case_canon_table), 2, + BVAR (current_buffer, case_eqv_table)); np = search_buffer (string, PT, PT_BYTE, lim, lim_byte, n, RE, (!NILP (BVAR (current_buffer, case_fold_search)) |