Merge from origin/emacs-24

[gnu-emacs] / src / disptab.h

diff --git a/src/disptab.h b/src/disptab.h
index e02bab04bbc9108a3c5f5c0accb77dedc1663ba9..7afc862312a4201d477c168f3e3835788c8a2caa 100644 (file)
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -1,5 +1,5 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1993, 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -48,9 +48,6 @@ extern struct Lisp_Char_Table *window_display_table (struct window *);
 /* Defined in indent.c.  */
 extern struct Lisp_Char_Table *buffer_display_table (void);
 
-/* This is the `purpose' slot of a display table.  */
-extern Lisp_Object Qdisplay_table;
-
 /* Return the current length of the GLYPH table,
    or 0 if the table isn't currently valid.  */
 #define GLYPH_TABLE_LENGTH  \
@@ -80,7 +77,7 @@ extern Lisp_Object Qdisplay_table;
       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