aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-03-15 11:08:06 -0700
committerPaul Eggert2011-03-15 11:08:06 -0700
commitdbd37a958fc17c793003ea95ad61ae51cff5ff45 (patch)
tree3782a4c46810efd267538246d97d77bfa4bb6de0
parent7e47afad4513977ba3cc5a175081f1c258a8ddfe (diff)
downloademacs-dbd37a958fc17c793003ea95ad61ae51cff5ff45.tar.gz
emacs-dbd37a958fc17c793003ea95ad61ae51cff5ff45.zip
* dired.c (compile_pattern): Move decl from here ...
* lisp.h: ... to here, so that it can be checked. (struct re_registers): New forward decl.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/dired.c5
-rw-r--r--src/lisp.h4
3 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d4f8061ed02..ba863ba5710 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12011-03-15 Paul Eggert <eggert@cs.ucla.edu> 12011-03-15 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * dired.c (compile_pattern): Move decl from here ...
4 * lisp.h: ... to here, so that it can be checked.
5 (struct re_registers): New forward decl.
6
3 * character.h (INC_POS, DEC_POS): Rename locals to avoid shadowing. 7 * character.h (INC_POS, DEC_POS): Rename locals to avoid shadowing.
4 8
5 * indent.c (MULTIBYTE_BYTES_WIDTH): New args bytes, width. 9 * indent.c (MULTIBYTE_BYTES_WIDTH): New args bytes, width.
diff --git a/src/dired.c b/src/dired.c
index 4080e1711e0..3e2ce5e96a6 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -79,11 +79,6 @@ extern struct direct *readdir (DIR *);
79#include "regex.h" 79#include "regex.h"
80#include "blockinput.h" 80#include "blockinput.h"
81 81
82/* Returns a search buffer, with a fastmap allocated and ready to go. */
83extern struct re_pattern_buffer *compile_pattern (Lisp_Object,
84 struct re_registers *,
85 Lisp_Object, int, int);
86
87Lisp_Object Qdirectory_files; 82Lisp_Object Qdirectory_files;
88Lisp_Object Qdirectory_files_and_attributes; 83Lisp_Object Qdirectory_files_and_attributes;
89Lisp_Object Qfile_name_completion; 84Lisp_Object Qfile_name_completion;
diff --git a/src/lisp.h b/src/lisp.h
index ddaf0438b00..ec45b83863b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3025,6 +3025,10 @@ EXFUN (Fset_match_data, 2);
3025EXFUN (Fmatch_beginning, 1); 3025EXFUN (Fmatch_beginning, 1);
3026EXFUN (Fmatch_end, 1); 3026EXFUN (Fmatch_end, 1);
3027extern void record_unwind_save_match_data (void); 3027extern void record_unwind_save_match_data (void);
3028struct re_registers;
3029extern struct re_pattern_buffer *compile_pattern (Lisp_Object,
3030 struct re_registers *,
3031 Lisp_Object, int, int);
3028extern int fast_string_match (Lisp_Object, Lisp_Object); 3032extern int fast_string_match (Lisp_Object, Lisp_Object);
3029extern int fast_c_string_match_ignore_case (Lisp_Object, const char *); 3033extern int fast_c_string_match_ignore_case (Lisp_Object, const char *);
3030extern int fast_string_match_ignore_case (Lisp_Object, Lisp_Object); 3034extern int fast_string_match_ignore_case (Lisp_Object, Lisp_Object);