Commit b932f8b1 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

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.
parent 42c8bc9b
2010-11-23 Dan Nicolaescu <dann@ics.uci.edu>
 
* 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):
......
......@@ -2674,11 +2674,15 @@ extern Lisp_Object Qimage, Qtext, Qboth, Qboth_horiz, Qtext_image_horiz;
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;
......
......@@ -66,6 +66,10 @@ extern int tgetent (char *, const char *);
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 no_controlling_tty;
static int system_uses_terminfo;
char *tparam (char *, char *, int, int, ...);
extern char *tgetstr (char *, char **);
#ifdef HAVE_GPM
......@@ -1914,12 +1915,6 @@ append_glyphless_glyph (struct it *it, int face_id, char *str)
}
}
/* 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment