[Emacs-diffs] Changes to emacs/src/lisp.h

[Ken Raeburn]

Index: emacs/src/lisp.h
diff -c emacs/src/lisp.h:1.432 emacs/src/lisp.h:1.433
*** emacs/src/lisp.h:1.432      Tue Jul 16 11:49:34 2002
--- emacs/src/lisp.h    Tue Jul 16 15:48:42 2002
***************
*** 2174,2181 ****
  EXFUN (Fchar_bytes, 1);
  EXFUN (Fchar_width, 1);
  EXFUN (Fstring, MANY);
! extern int chars_in_text P_ ((unsigned char *, int));
! extern int multibyte_chars_in_text P_ ((unsigned char *, int));
  extern int unibyte_char_to_multibyte P_ ((int));
  extern int multibyte_char_to_unibyte P_ ((int, Lisp_Object));
  extern Lisp_Object Qcharset;
--- 2174,2181 ----
  EXFUN (Fchar_bytes, 1);
  EXFUN (Fchar_width, 1);
  EXFUN (Fstring, MANY);
! extern int chars_in_text P_ ((const unsigned char *, int));
! extern int multibyte_chars_in_text P_ ((const unsigned char *, int));
  extern int unibyte_char_to_multibyte P_ ((int));
  extern int multibyte_char_to_unibyte P_ ((int, Lisp_Object));
  extern Lisp_Object Qcharset;
***************
*** 2306,2325 ****
  extern void move_gap P_ ((int));
  extern void move_gap_both P_ ((int, int));
  extern void make_gap P_ ((int));
! extern int copy_text P_ ((unsigned char *, unsigned char *, int, int, int));
! extern int count_size_as_multibyte P_ ((unsigned char *, int));
! extern int count_combining_before P_ ((unsigned char *, int, int, int));
! extern int count_combining_after P_ ((unsigned char *, int, int, int));
! extern void insert P_ ((unsigned char *, int));
! extern void insert_and_inherit P_ ((unsigned char *, int));
! extern void insert_1 P_ ((unsigned char *, int, int, int, int));
! extern void insert_1_both P_ ((unsigned char *, int, int, int, int, int));
  extern void insert_from_string P_ ((Lisp_Object, int, int, int, int, int));
  extern void insert_from_buffer P_ ((struct buffer *, int, int, int));
  extern void insert_char P_ ((int));
! extern void insert_string P_ ((char *));
! extern void insert_before_markers P_ ((unsigned char *, int));
! extern void insert_before_markers_and_inherit P_ ((unsigned char *, int));
  extern void insert_from_string_before_markers P_ ((Lisp_Object, int, int, 
int, int, int));
  extern void del_range P_ ((int, int));
  extern Lisp_Object del_range_1 P_ ((int, int, int, int));
--- 2306,2325 ----
  extern void move_gap P_ ((int));
  extern void move_gap_both P_ ((int, int));
  extern void make_gap P_ ((int));
! extern int copy_text P_ ((const unsigned char *, unsigned char *, int, int, 
int));
! extern int count_size_as_multibyte P_ ((const unsigned char *, int));
! extern int count_combining_before P_ ((const unsigned char *, int, int, int));
! extern int count_combining_after P_ ((const unsigned char *, int, int, int));
! extern void insert P_ ((const unsigned char *, int));
! extern void insert_and_inherit P_ ((const unsigned char *, int));
! extern void insert_1 P_ ((const unsigned char *, int, int, int, int));
! extern void insert_1_both P_ ((const unsigned char *, int, int, int, int, 
int));
  extern void insert_from_string P_ ((Lisp_Object, int, int, int, int, int));
  extern void insert_from_buffer P_ ((struct buffer *, int, int, int));
  extern void insert_char P_ ((int));
! extern void insert_string P_ ((const char *));
! extern void insert_before_markers P_ ((const unsigned char *, int));
! extern void insert_before_markers_and_inherit P_ ((const unsigned char *, 
int));
  extern void insert_from_string_before_markers P_ ((Lisp_Object, int, int, 
int, int, int));
  extern void del_range P_ ((int, int));
  extern Lisp_Object del_range_1 P_ ((int, int, int, int));
***************
*** 2365,2381 ****
  extern void pop_message P_ ((void));
  extern void restore_message P_ ((void));
  extern Lisp_Object current_message P_ ((void));
! extern void set_message P_ ((char *s, Lisp_Object, int, int));
  extern void clear_message P_ ((int, int));
  extern void message P_ ((/* char *, ... */));
  extern void message_nolog P_ ((/* char *, ... */));
  extern void message1 P_ ((char *));
  extern void message1_nolog P_ ((char *));
! extern void message2 P_ ((char *, int, int));
! extern void message2_nolog P_ ((char *, int, int));
  extern void message3 P_ ((Lisp_Object, int, int));
  extern void message3_nolog P_ ((Lisp_Object, int, int));
! extern void message_dolog P_ ((char *, int, int, int));
  extern void message_with_string P_ ((char *, Lisp_Object, int));
  extern void message_log_maybe_newline P_ ((void));
  extern void update_echo_area P_ ((void));
--- 2365,2381 ----
  extern void pop_message P_ ((void));
  extern void restore_message P_ ((void));
  extern Lisp_Object current_message P_ ((void));
! extern void set_message P_ ((const char *s, Lisp_Object, int, int));
  extern void clear_message P_ ((int, int));
  extern void message P_ ((/* char *, ... */));
  extern void message_nolog P_ ((/* char *, ... */));
  extern void message1 P_ ((char *));
  extern void message1_nolog P_ ((char *));
! extern void message2 P_ ((const char *, int, int));
! extern void message2_nolog P_ ((const char *, int, int));
  extern void message3 P_ ((Lisp_Object, int, int));
  extern void message3_nolog P_ ((Lisp_Object, int, int));
! extern void message_dolog P_ ((const char *, int, int, int));
  extern void message_with_string P_ ((char *, Lisp_Object, int));
  extern void message_log_maybe_newline P_ ((void));
  extern void update_echo_area P_ ((void));
***************
*** 2418,2427 ****
  EXFUN (Fmake_symbol, 1);
  EXFUN (Fmake_marker, 0);
  EXFUN (Fmake_string, 2);
! extern Lisp_Object build_string P_ ((char *));
! extern Lisp_Object make_string P_ ((char *, int));
! extern Lisp_Object make_unibyte_string P_ ((char *, int));
! extern Lisp_Object make_multibyte_string P_ ((char *, int, int));
  extern Lisp_Object make_event_array P_ ((int, Lisp_Object *));
  extern Lisp_Object make_uninit_string P_ ((int));
  extern Lisp_Object make_uninit_multibyte_string P_ ((int, int));
--- 2418,2427 ----
  EXFUN (Fmake_symbol, 1);
  EXFUN (Fmake_marker, 0);
  EXFUN (Fmake_string, 2);
! extern Lisp_Object build_string P_ ((const char *));
! extern Lisp_Object make_string P_ ((const char *, int));
! extern Lisp_Object make_unibyte_string P_ ((const char *, int));
! extern Lisp_Object make_multibyte_string P_ ((const char *, int, int));
  extern Lisp_Object make_event_array P_ ((int, Lisp_Object *));
  extern Lisp_Object make_uninit_string P_ ((int));
  extern Lisp_Object make_uninit_multibyte_string P_ ((int, int));
***************
*** 2493,2501 ****
  EXFUN (Fread_event, 2);
  extern Lisp_Object read_filtered_event P_ ((int, int, int, int));
  EXFUN (Feval_region, 4);
! extern Lisp_Object intern P_ ((char *));
  extern Lisp_Object make_symbol P_ ((char *));
! extern Lisp_Object oblookup P_ ((Lisp_Object, char *, int, int));
  #define LOADHIST_ATTACH(x) \
   if (initialized) Vcurrent_load_list = Fcons (x, Vcurrent_load_list)
  extern Lisp_Object Vcurrent_load_list;
--- 2493,2501 ----
  EXFUN (Fread_event, 2);
  extern Lisp_Object read_filtered_event P_ ((int, int, int, int));
  EXFUN (Feval_region, 4);
! extern Lisp_Object intern P_ ((const char *));
  extern Lisp_Object make_symbol P_ ((char *));
! extern Lisp_Object oblookup P_ ((Lisp_Object, const char *, int, int));
  #define LOADHIST_ATTACH(x) \
   if (initialized) Vcurrent_load_list = Fcons (x, Vcurrent_load_list)
  extern Lisp_Object Vcurrent_load_list;
***************
*** 2728,2734 ****
  EXFUN (Ffile_executable_p, 1);
  EXFUN (Fread_file_name, 6);
  extern Lisp_Object close_file_unwind P_ ((Lisp_Object));
! extern void report_file_error P_ ((char *, Lisp_Object));
  extern int internal_delete_file P_ ((Lisp_Object));
  extern void syms_of_fileio P_ ((void));
  EXFUN (Fmake_temp_name, 1);
--- 2728,2734 ----
  EXFUN (Ffile_executable_p, 1);
  EXFUN (Fread_file_name, 6);
  extern Lisp_Object close_file_unwind P_ ((Lisp_Object));
! extern void report_file_error P_ ((const char *, Lisp_Object));
  extern int internal_delete_file P_ ((Lisp_Object));
  extern void syms_of_fileio P_ ((void));
  EXFUN (Fmake_temp_name, 1);
***************
*** 2750,2756 ****
  EXFUN (Fmatch_end, 1);
  EXFUN (Flooking_at, 1);
  extern int fast_string_match P_ ((Lisp_Object, Lisp_Object));
! extern int fast_c_string_match_ignore_case P_ ((Lisp_Object, char *));
  extern int scan_buffer P_ ((int, int, int, int, int *, int));
  extern int scan_newline P_ ((int, int, int, int, int, int));
  extern int find_next_newline P_ ((int, int));
--- 2750,2756 ----
  EXFUN (Fmatch_end, 1);
  EXFUN (Flooking_at, 1);
  extern int fast_string_match P_ ((Lisp_Object, Lisp_Object));
! extern int fast_c_string_match_ignore_case P_ ((Lisp_Object, const char *));
  extern int scan_buffer P_ ((int, int, int, int, int *, int));
  extern int scan_newline P_ ((int, int, int, int, int, int));
  extern int find_next_newline P_ ((int, int));
***************
*** 2771,2777 ****
  EXFUN (Fread_string, 5);
  EXFUN (Fread_no_blanks_input, 3);
  extern Lisp_Object get_minibuffer P_ ((int));
! extern void temp_echo_area_glyphs P_ ((char *));
  extern void init_minibuf_once P_ ((void));
  extern void syms_of_minibuf P_ ((void));
  extern void keys_of_minibuf P_ ((void));
--- 2771,2777 ----
  EXFUN (Fread_string, 5);
  EXFUN (Fread_no_blanks_input, 3);
  extern Lisp_Object get_minibuffer P_ ((int));
! extern void temp_echo_area_glyphs P_ ((const char *));
  extern void init_minibuf_once P_ ((void));
  extern void syms_of_minibuf P_ ((void));
  extern void keys_of_minibuf P_ ((void));
***************
*** 3059,3065 ****
  extern void create_process P_ ((Lisp_Object, char **, Lisp_Object));
  extern int tabs_safe_p P_ ((void));
  extern void init_baud_rate P_ ((void));
! extern int emacs_open P_ ((char *, int, int));
  extern int emacs_close P_ ((int));
  extern int emacs_read P_ ((int, char *, unsigned int));
  extern int emacs_write P_ ((int, char *, unsigned int));
--- 3059,3065 ----
  extern void create_process P_ ((Lisp_Object, char **, Lisp_Object));
  extern int tabs_safe_p P_ ((void));
  extern void init_baud_rate P_ ((void));
! extern int emacs_open P_ ((const char *, int, int));
  extern int emacs_close P_ ((int));
  extern int emacs_read P_ ((int, char *, unsigned int));
  extern int emacs_write P_ ((int, char *, unsigned int));
***************
*** 3136,3142 ****
  extern POINTER_TYPE *xrealloc P_ ((POINTER_TYPE *, size_t));
  extern void xfree P_ ((POINTER_TYPE *));
  
! extern char *xstrdup P_ ((char *));
  
  #ifndef USE_CRT_DLL
  extern char *egetenv P_ ((char *));
--- 3136,3142 ----
  extern POINTER_TYPE *xrealloc P_ ((POINTER_TYPE *, size_t));
  extern void xfree P_ ((POINTER_TYPE *));
  
! extern char *xstrdup P_ ((const char *));
  
  #ifndef USE_CRT_DLL
  extern char *egetenv P_ ((char *));