[Emacs-diffs] /srv/bzr/emacs/trunk r102489: Move extern declarations from term.c to lisp.h.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 102489
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-23 10:56:28 -0800
message:
  Move extern declarations from term.c to lisp.h.
  
  * src/term.c (Qglyphless_char,last_glyphless_glyph_frame)
  (last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
  Move declarations ...
  * src/lisp.h (Qglyphless_char,last_glyphless_glyph_frame)
  (last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
  ... here.
modified:
  src/ChangeLog
  src/lisp.h
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-23 18:47:23 +0000
+++ b/src/ChangeLog     2010-11-23 18:56:28 +0000
@@ -1,5 +1,12 @@
 2010-11-23  Dan Nicolaescu  <address@hidden>
 
+       * term.c (Qglyphless_char,last_glyphless_glyph_frame)
+       (last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
+       Move declarations ...
+       * lisp.h (Qglyphless_char,last_glyphless_glyph_frame)
+       (last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
+       ... here.
+
        * emacs.c (gdb_use_union, gdb_valbits,gdb_gctypebits)
        (gdb_data_seg_bits, gdb_array_mark_flag, PVEC_FLAG)
        (gdb_pvec_type):

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2010-11-23 18:47:23 +0000
+++ b/src/lisp.h        2010-11-23 18:56:28 +0000
@@ -2674,11 +2674,15 @@
 extern Lisp_Object Qspace, Qcenter, QCalign_to;
 extern Lisp_Object Qbar, Qhbar, Qbox, Qhollow;
 extern Lisp_Object Qleft_margin, Qright_margin;
+extern Lisp_Object Qglyphless_char;
 extern Lisp_Object Vmessage_log_max;
 extern Lisp_Object QCdata, QCfile;
 extern Lisp_Object QCmap;
 extern Lisp_Object Qrisky_local_variable;
 extern Lisp_Object Vinhibit_redisplay;
+extern struct frame *last_glyphless_glyph_frame;
+extern unsigned last_glyphless_glyph_face_id;
+extern int last_glyphless_glyph_merged_face_id;
 extern int message_enable_multibyte;
 extern int noninteractive_need_newline;
 extern EMACS_INT scroll_margin;

=== modified file 'src/term.c'
--- a/src/term.c        2010-11-20 15:04:50 +0000
+++ b/src/term.c        2010-11-23 18:56:28 +0000
@@ -66,6 +66,10 @@
 extern int tgetflag (char *id);
 extern int tgetnum (char *id);
 
+char *tparam (char *, char *, int, int, ...);
+
+extern char *tgetstr (char *, char **);
+
 #include "cm.h"
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
@@ -176,9 +180,6 @@
 
 static int system_uses_terminfo;
 
-char *tparam (char *, char *, int, int, ...);
-
-extern char *tgetstr (char *, char **);
 
 
 #ifdef HAVE_GPM
@@ -1914,12 +1915,6 @@
     }
 }
 
-/* Declared in xdisp.c */
-extern struct frame *last_glyphless_glyph_frame;
-extern unsigned last_glyphless_glyph_face_id;
-extern int last_glyphless_glyph_merged_face_id;
-extern Lisp_Object Qglyphless_char;
-
 /* Produce glyphs for a glyphless character for iterator IT.
    IT->glyphless_method specifies which method to use for displaying
    the character.  See the description of enum