diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/search.c | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index 8b4d39c7811..19cc08f84c4 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -22,10 +22,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 22 | #include <config.h> | 22 | #include <config.h> |
| 23 | 23 | ||
| 24 | #include "lisp.h" | 24 | #include "lisp.h" |
| 25 | #include "syntax.h" | ||
| 26 | #include "category.h" | 25 | #include "category.h" |
| 27 | #include "character.h" | 26 | #include "character.h" |
| 28 | #include "buffer.h" | 27 | #include "buffer.h" |
| 28 | #include "syntax.h" | ||
| 29 | #include "charset.h" | 29 | #include "charset.h" |
| 30 | #include "region-cache.h" | 30 | #include "region-cache.h" |
| 31 | #include "commands.h" | 31 | #include "commands.h" |