diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/search.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/search.c b/src/search.c index d9be8ca0105..6c835f2cc64 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -53,10 +53,10 @@ struct regexp_cache | |||
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | /* The instances of that struct. */ | 55 | /* The instances of that struct. */ |
| 56 | struct regexp_cache searchbufs[REGEXP_CACHE_SIZE]; | 56 | static struct regexp_cache searchbufs[REGEXP_CACHE_SIZE]; |
| 57 | 57 | ||
| 58 | /* The head of the linked list; points to the most recently used buffer. */ | 58 | /* The head of the linked list; points to the most recently used buffer. */ |
| 59 | struct regexp_cache *searchbuf_head; | 59 | static struct regexp_cache *searchbuf_head; |
| 60 | 60 | ||
| 61 | 61 | ||
| 62 | /* Every call to re_match, etc., must pass &search_regs as the regs | 62 | /* Every call to re_match, etc., must pass &search_regs as the regs |
| @@ -85,10 +85,10 @@ static Lisp_Object last_thing_searched; | |||
| 85 | 85 | ||
| 86 | /* error condition signaled when regexp compile_pattern fails */ | 86 | /* error condition signaled when regexp compile_pattern fails */ |
| 87 | 87 | ||
| 88 | Lisp_Object Qinvalid_regexp; | 88 | static Lisp_Object Qinvalid_regexp; |
| 89 | 89 | ||
| 90 | /* Error condition used for failing searches */ | 90 | /* Error condition used for failing searches */ |
| 91 | Lisp_Object Qsearch_failed; | 91 | static Lisp_Object Qsearch_failed; |
| 92 | 92 | ||
| 93 | static void set_search_regs (EMACS_INT, EMACS_INT); | 93 | static void set_search_regs (EMACS_INT, EMACS_INT); |
| 94 | static void save_search_regs (void); | 94 | static void save_search_regs (void); |