From 0e9c8657ca938bd3cdb90824873dff539801fdbe Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 7 Aug 2010 03:10:12 +0200 Subject: [PATCH] Remove duplicate declarations. * lib-src/ebrowse.c (usage, version, mark_virtual) * src/alloc.c (lisp_malloc) * src/buffer.c (set_buffer_internal, set_buffer_internal_1) * src/charset.h (emacs_mule_charset) * src/dispextern.h (inhibit_free_realized_faces, redraw_frame) (redraw_garbaged_frames, scroll_cost, update_frame, scrolling) (bitch_at_user) * src/lisp.h (Fcheck_coding_system, Fget_text_property) (Qfunction, Qcompletion_ignore_case, QCwidth, QCsize) --- lib-src/ChangeLog | 5 +++++ lib-src/ebrowse.c | 3 --- src/ChangeLog | 12 ++++++++++++ src/alloc.c | 1 - src/buffer.c | 2 -- src/charset.h | 2 -- src/dispextern.h | 7 ------- src/lisp.h | 8 ++------ 8 files changed, 19 insertions(+), 21 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bcd4b1a516..6ac9bf19a2 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2010-08-07 Juanma Barranquero + + * ebrowse.c (usage, version, mark_virtual): + Remove duplicate declarations. + 2010-08-06 Dan Nicolaescu * emacsclient.c: Move socket related #includes together with the diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index a9f7ba4f3a..40e7293942 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -492,8 +492,6 @@ void register_namespace_alias (char *, struct link *); void insert_keyword (char *, int); void re_init_scanner (void); void init_scanner (void); -void usage (int); -void version (void); void process_file (char *); void add_search_path (char *); FILE *open_file (char *); @@ -504,7 +502,6 @@ int dump_tree (FILE *, struct sym *); struct member *find_member (struct sym *, char *, int, int, unsigned); struct member *add_member (struct sym *, char *, int, int, unsigned); void mark_virtual (struct sym *); -void mark_virtual (struct sym *); struct sym *make_namespace (char *, struct sym *); char *sym_scope (struct sym *); char *sym_scope_1 (struct sym *); diff --git a/src/ChangeLog b/src/ChangeLog index 509ed3e7ea..09a0f73e75 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2010-08-07 Juanma Barranquero + + * alloc.c (lisp_malloc): + * buffer.c (set_buffer_internal, set_buffer_internal_1): + * charset.h (emacs_mule_charset): + * dispextern.h (inhibit_free_realized_faces, redraw_frame) + (redraw_garbaged_frames, scroll_cost, update_frame, scrolling) + (bitch_at_user): + * lisp.h (Fcheck_coding_system, Fget_text_property) + (Qfunction, Qcompletion_ignore_case, QCwidth, QCsize): + Remove duplicate declarations. + 2010-08-06 Dan Nicolaescu * process.c: Simplify include logic. diff --git a/src/alloc.c b/src/alloc.c index 2ddec3dbe4..473c5622ab 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -448,7 +448,6 @@ static void *min_heap_address, *max_heap_address; static struct mem_node mem_z; #define MEM_NIL &mem_z -static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); static struct Lisp_Vector *allocate_vectorlike (EMACS_INT); static void lisp_free (POINTER_TYPE *); static void mark_stack (void); diff --git a/src/buffer.c b/src/buffer.c index 6f41b36b92..7d42489dd3 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -106,8 +106,6 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; int last_per_buffer_idx; EXFUN (Fset_buffer, 1); -void set_buffer_internal (struct buffer *b); -void set_buffer_internal_1 (struct buffer *b); static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, int after, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3); diff --git a/src/charset.h b/src/charset.h index 095dcefe15..dbe9c776a0 100644 --- a/src/charset.h +++ b/src/charset.h @@ -517,8 +517,6 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; #define EMACS_MULE_LEADING_CODE_PRIVATE_21 0x9C /* 2/2 */ #define EMACS_MULE_LEADING_CODE_PRIVATE_22 0x9D /* 2/2 */ -extern struct charset *emacs_mule_charset[256]; - extern Lisp_Object Qcharsetp; diff --git a/src/dispextern.h b/src/dispextern.h index dba0d06732..5461e9ff49 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2430,7 +2430,6 @@ struct it #define PRODUCE_GLYPHS(IT) \ do { \ - extern int inhibit_free_realized_faces; \ if ((IT)->glyph_row != NULL && (IT)->bidi_p) \ { \ if ((IT)->bidi_it.paragraph_dir == R2L) \ @@ -3243,15 +3242,9 @@ void clear_glyph_row (struct glyph_row *); void prepare_desired_row (struct glyph_row *); int line_hash_code (struct glyph_row *); void set_window_update_flags (struct window *, int); -void redraw_frame (struct frame *); -void redraw_garbaged_frames (void); -int scroll_cost (struct frame *, int, int, int); -int update_frame (struct frame *, int, int); void update_single_window (struct window *, int); -int scrolling (struct frame *); void do_pending_window_change (int); void change_frame_size (struct frame *, int, int, int, int, int); -void bitch_at_user (void); void init_display (void); void syms_of_display (void); extern Lisp_Object Qredisplay_dont_pause; diff --git a/src/lisp.h b/src/lisp.h index b529c76d5b..218c6e630f 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2395,7 +2395,6 @@ EXFUN (Fcoding_system_p, 1); EXFUN (Fcoding_system_base, 1); EXFUN (Fcoding_system_eol_type, 1); EXFUN (Fcheck_coding_system, 1); -EXFUN (Fcheck_coding_system, 1); EXFUN (Fread_coding_system, 2); EXFUN (Fread_non_nil_coding_system, 1); EXFUN (Ffind_operation_coding_system, MANY); @@ -2822,7 +2821,6 @@ extern int doprnt (char *, int, const char *, const char *, va_list); /* Defined in lread.c */ extern Lisp_Object Vafter_load_alist; extern Lisp_Object Qvariable_documentation, Qstandard_input; -extern Lisp_Object Qfunction; extern Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; extern Lisp_Object Vobarray, initial_obarray, Vstandard_input; extern int load_in_progress; @@ -3134,7 +3132,6 @@ extern void clear_regexp_cache (void); /* Defined in minibuf.c */ -extern Lisp_Object Qcompletion_ignore_case; extern Lisp_Object Qcompletion_ignore_case; extern Lisp_Object Vcompletion_regexp_list; extern Lisp_Object Vhistory_length; @@ -3417,7 +3414,6 @@ EXFUN (Fnext_single_char_property_change, 4); EXFUN (Fprevious_single_property_change, 4); EXFUN (Fget_text_property, 3); EXFUN (Fput_text_property, 5); -EXFUN (Fget_text_property, 3); EXFUN (Fprevious_char_property_change, 2); EXFUN (Fnext_char_property_change, 2); extern void report_interval_modification (Lisp_Object, Lisp_Object); @@ -3540,8 +3536,8 @@ extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; extern Lisp_Object Qmode_line_inactive, Qvertical_border; extern Lisp_Object Qface; extern Lisp_Object Qnormal; -extern Lisp_Object QCfamily, QCweight, QCslant, QCwidth; -extern Lisp_Object QCheight, QCsize, QCname, QCwidth, QCforeground, QCbackground; +extern Lisp_Object QCfamily, QCweight, QCslant; +extern Lisp_Object QCheight, QCname, QCwidth, QCforeground, QCbackground; extern Lisp_Object Vface_alternative_font_family_alist; extern Lisp_Object Vface_font_rescale_alist; extern Lisp_Object Vface_ignored_fonts; -- 2.20.1