X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/26e06f4464c58704889bdc536edc25b73e8c0179..8d3655be5a5c41b1f0a9985bcdb614693fce67e5:/src/disptab.h

diff --git a/src/disptab.h b/src/disptab.h
index aab2198659..e02bab04bb 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -1,6 +1,5 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -32,7 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4])
 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5])
 
-extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int));
+extern Lisp_Object disp_char_vector (struct Lisp_Char_Table *, int);
 
 #define DISP_CHAR_VECTOR(dp, c)				\
   (ASCII_CHAR_P(c)					\
@@ -44,25 +43,18 @@ extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int));
    : disp_char_vector ((dp), (c)))
 
 /* Defined in window.c.  */
-extern struct Lisp_Char_Table *window_display_table P_ ((struct window *));
+extern struct Lisp_Char_Table *window_display_table (struct window *);
 
 /* Defined in indent.c.  */
-extern struct Lisp_Char_Table *buffer_display_table P_ ((void));
-
-/* Display table to use for vectors that don't specify their own.  */
-extern Lisp_Object Vstandard_display_table;
+extern struct Lisp_Char_Table *buffer_display_table (void);
 
 /* 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  \
-  ((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.  */
@@ -103,6 +95,3 @@ extern Lisp_Object Vglyph_table;
 
 #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) */