diff options
| author | Andreas Schwab | 2010-07-12 19:47:17 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-07-12 19:47:17 +0200 |
| commit | d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e (patch) | |
| tree | eeb2e0ed5cb8f7ccb1cd41cfceb03c6aaa2897fc /src/search.c | |
| parent | ded80a25b7d4a088dd4c4a714666705749106138 (diff) | |
| download | emacs-d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e.tar.gz emacs-d5a3eaaf13bf8de7e52a79f3c9e8c248dbb5a93e.zip | |
Convert old-style definitions
* editfns.c (transpose_markers): Convert old-style definition.
* emacs.c (abort, shut_down_emacs, fixup_locale)
(synchronize_system_time_locale)
(synchronize_system_messages_locale, syms_of_emacs): Likewise.
* floatfns.c (extract_float, matherr, init_floatfns)
(syms_of_floatfns): Likewise.
* fns.c (make_hash_table): Likewise.
* ftfont.c (ftfont_get_otf, ftfont_otf_features)
(ftfont_otf_capability, ftfont_get_glyph_id, ftfont_get_metrics)
(ftfont_drive_otf, ftfont_shape_by_flt, ftfont_shape)
(ftfont_variation_glyphs): Likewise.
* gtkutil.c (xg_create_widget, xg_modify_menubar_widgets): Likewise.
* keymap.c (describe_map_tree, describe_map, describe_vector): Likewise.
* lread.c (read_filtered_event): Likewise.
* minibuf.c (read_minibuf_noninteractive, read_minibuf): Likewise.
* process.c (wait_reading_process_output): Likewise.
* scroll.c (do_line_insertion_deletion_costs): Likewise.
* search.c (search_buffer, boyer_moore): Likewise.
* syntax.c (scan_sexps_forward): Likewise.
* xdisp.c (try_scrolling): Likewise.
* xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Likewise.
* xfns.c (x_default_scroll_bar_color_parameter): Likewise.
* xselect.c (x_get_window_property, receive_incremental_selection)
(x_get_window_property_as_lisp_data, lisp_data_to_selection_data):
Likewise.
* xterm.c (x_draw_relief_rect, x_draw_box_rect): Likewise.
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/src/search.c b/src/search.c index 4f8b801c122..602a50c0abe 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -1110,18 +1110,9 @@ while (0) | |||
| 1110 | static struct re_registers search_regs_1; | 1110 | static struct re_registers search_regs_1; |
| 1111 | 1111 | ||
| 1112 | static EMACS_INT | 1112 | static EMACS_INT |
| 1113 | search_buffer (string, pos, pos_byte, lim, lim_byte, n, | 1113 | search_buffer (Lisp_Object string, EMACS_INT pos, EMACS_INT pos_byte, |
| 1114 | RE, trt, inverse_trt, posix) | 1114 | EMACS_INT lim, EMACS_INT lim_byte, int n, |
| 1115 | Lisp_Object string; | 1115 | int RE, Lisp_Object trt, Lisp_Object inverse_trt, int posix) |
| 1116 | EMACS_INT pos; | ||
| 1117 | EMACS_INT pos_byte; | ||
| 1118 | EMACS_INT lim; | ||
| 1119 | EMACS_INT lim_byte; | ||
| 1120 | int n; | ||
| 1121 | int RE; | ||
| 1122 | Lisp_Object trt; | ||
| 1123 | Lisp_Object inverse_trt; | ||
| 1124 | int posix; | ||
| 1125 | { | 1116 | { |
| 1126 | int len = SCHARS (string); | 1117 | int len = SCHARS (string); |
| 1127 | int len_byte = SBYTES (string); | 1118 | int len_byte = SBYTES (string); |
| @@ -1668,16 +1659,10 @@ simple_search (int n, unsigned char *pat, int len, int len_byte, Lisp_Object trt | |||
| 1668 | If that criterion is not satisfied, do not call this function. */ | 1659 | If that criterion is not satisfied, do not call this function. */ |
| 1669 | 1660 | ||
| 1670 | static EMACS_INT | 1661 | static EMACS_INT |
| 1671 | boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt, | 1662 | boyer_moore (int n, unsigned char *base_pat, int len, int len_byte, |
| 1672 | pos, pos_byte, lim, lim_byte, char_base) | 1663 | Lisp_Object trt, Lisp_Object inverse_trt, |
| 1673 | int n; | 1664 | EMACS_INT pos, EMACS_INT pos_byte, |
| 1674 | unsigned char *base_pat; | 1665 | EMACS_INT lim, EMACS_INT lim_byte, int char_base) |
| 1675 | int len, len_byte; | ||
| 1676 | Lisp_Object trt; | ||
| 1677 | Lisp_Object inverse_trt; | ||
| 1678 | EMACS_INT pos, pos_byte; | ||
| 1679 | EMACS_INT lim, lim_byte; | ||
| 1680 | int char_base; | ||
| 1681 | { | 1666 | { |
| 1682 | int direction = ((n > 0) ? 1 : -1); | 1667 | int direction = ((n > 0) ? 1 : -1); |
| 1683 | register int dirlen; | 1668 | register int dirlen; |