HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dynwind fixes
[bpt/emacs.git]
/
src
/
disptab.h
diff --git
a/src/disptab.h
b/src/disptab.h
index
0445a8f
..
81c22b8
100644
(file)
--- a/
src/disptab.h
+++ b/
src/disptab.h
@@
-1,6
+1,5
@@
/* Things for GLYPHS and glyph tables.
/* Things for GLYPHS and glyph tables.
- Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1993, 2001-2014 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-49,20
+48,13
@@
extern struct Lisp_Char_Table *window_display_table (struct window *);
/* Defined in indent.c. */
extern struct Lisp_Char_Table *buffer_display_table (void);
/* Defined in indent.c. */
extern struct Lisp_Char_Table *buffer_display_table (void);
-/* Display table to use for vectors that don't specify their own. */
-extern Lisp_Object Vstandard_display_table;
-
/* This is the `purpose' slot of a display table. */
extern Lisp_Object Qdisplay_table;
/* This is the `purpose' slot of a display table. */
extern Lisp_Object Qdisplay_table;
-/* Vector of GLYPH definitions. Indexed by GLYPH number,
- the contents are a string which is how to output the GLYPH. */
-extern Lisp_Object Vglyph_table;
-
/* Return the current length of the GLYPH table,
or 0 if the table isn't currently valid. */
#define GLYPH_TABLE_LENGTH \
/* Return the current length of the GLYPH table,
or 0 if the table isn't currently valid. */
#define GLYPH_TABLE_LENGTH \
- ((VECTORP (Vglyph_table)) ?
XVECTOR (Vglyph_table)->size
: 0)
+ ((VECTORP (Vglyph_table)) ?
ASIZE (Vglyph_table)
: 0)
/* Return the current base (for indexing) of the GLYPH table,
or 0 if the table isn't currently valid. */
/* Return the current base (for indexing) of the GLYPH table,
or 0 if the table isn't currently valid. */
@@
-88,7
+80,7
@@
extern Lisp_Object Vglyph_table;
SET_GLYPH_CHAR ((g), XINT ((base)[GLYPH_CHAR (g)])); \
if (!GLYPH_CHAR_VALID_P (g)) \
SET_GLYPH_CHAR (g, ' '); \
SET_GLYPH_CHAR ((g), XINT ((base)[GLYPH_CHAR (g)])); \
if (!GLYPH_CHAR_VALID_P (g)) \
SET_GLYPH_CHAR (g, ' '); \
- } while (
0
)
+ } while (
false
)
/* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0,
return the length and the address of the character-sequence
/* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0,
return the length and the address of the character-sequence
@@
-103,6
+95,3
@@
extern Lisp_Object Vglyph_table;
#define SET_GLYPH_FROM_CHAR(glyph, c) \
SET_GLYPH (glyph, c, DEFAULT_FACE_ID)
#define SET_GLYPH_FROM_CHAR(glyph, c) \
SET_GLYPH (glyph, c, DEFAULT_FACE_ID)
-
-/* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349
- (do not change this comment) */