[Emacs-diffs] /srv/bzr/emacs/trunk r101011: Remove duplicate declarations.

[Juanma Barranquero]

------------------------------------------------------------
revno: 101011
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2010-08-07 03:10:12 +0200
message:
  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)
modified:
  lib-src/ChangeLog
  lib-src/ebrowse.c
  src/ChangeLog
  src/alloc.c
  src/buffer.c
  src/charset.h
  src/dispextern.h
  src/lisp.h

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-08-06 04:09:54 +0000
+++ b/lib-src/ChangeLog 2010-08-07 01:10:12 +0000
@@ -1,3 +1,8 @@
+2010-08-07  Juanma Barranquero  <address@hidden>
+
+       * ebrowse.c (usage, version, mark_virtual):
+       Remove duplicate declarations.
+
 2010-08-06  Dan Nicolaescu  <address@hidden>
 
        * emacsclient.c: Move socket related #includes together with the

=== modified file 'lib-src/ebrowse.c'
--- a/lib-src/ebrowse.c 2010-07-08 05:48:57 +0000
+++ b/lib-src/ebrowse.c 2010-08-07 01:10:12 +0000
@@ -492,8 +492,6 @@
 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 @@
 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 *);

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-06 20:08:26 +0000
+++ b/src/ChangeLog     2010-08-07 01:10:12 +0000
@@ -1,3 +1,15 @@
+2010-08-07  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * process.c: Simplify include logic.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2010-07-23 17:50:14 +0000
+++ b/src/alloc.c       2010-08-07 01:10:12 +0000
@@ -448,7 +448,6 @@
 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);

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2010-07-30 04:42:38 +0000
+++ b/src/buffer.c      2010-08-07 01:10:12 +0000
@@ -106,8 +106,6 @@
 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);

=== modified file 'src/charset.h'
--- a/src/charset.h     2010-07-02 09:26:33 +0000
+++ b/src/charset.h     2010-08-07 01:10:12 +0000
@@ -517,8 +517,6 @@
 #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;

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2010-08-05 23:15:24 +0000
+++ b/src/dispextern.h  2010-08-07 01:10:12 +0000
@@ -2430,7 +2430,6 @@
 
 #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 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;

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2010-08-06 18:56:41 +0000
+++ b/src/lisp.h        2010-08-07 01:10:12 +0000
@@ -2395,7 +2395,6 @@
 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 @@
 /* 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;
@@ -3135,7 +3133,6 @@
 /* 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;
 extern Lisp_Object Vminibuffer_list;
@@ -3417,7 +3414,6 @@
 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 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;