(verify_interval_modification): Don't run

[gnu-emacs] / src / lisp.h

diff --git a/src/lisp.h b/src/lisp.h
index 37ed041b77bfbb66d4ad2ef0fb66fbcf0f42c8b5..6e043199f8f729659d72914893d475f5ac381013 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -76,7 +76,7 @@ extern void die P_((const char *, const char *, int));
 #endif
 
 /* Used for making sure that Emacs is compilable in all
-   conigurations.  */
+   configurations.  */
 
 #ifdef USE_LISP_UNION_TYPE
 #undef NO_UNION_TYPE
@@ -471,7 +471,7 @@ extern Lisp_Object make_number ();
 /* Extract a value or address from a Lisp_Object.  */
 
 #define XCONS(a) (eassert (GC_CONSP(a)),(struct Lisp_Cons *) XPNTR(a))
-#define XVECTOR(a) ((struct Lisp_Vector *) XPNTR(a))
+#define XVECTOR(a) (eassert (GC_VECTORLIKEP(a)),(struct Lisp_Vector *) XPNTR(a))
 #define XSTRING(a) (eassert (GC_STRINGP(a)),(struct Lisp_String *) XPNTR(a))
 #define XSYMBOL(a) (eassert (GC_SYMBOLP(a)),(struct Lisp_Symbol *) XPNTR(a))
 #define XFLOAT(a) (eassert (GC_FLOATP(a)),(struct Lisp_Float *) XPNTR(a))
@@ -1222,8 +1222,7 @@ typedef unsigned char UCHAR;
 #define GLYPH_FACE(f, g) (FAST_GLYPH_FACE (g))
 
 /* Return 1 iff GLYPH contains valid character code.  */
-#define GLYPH_CHAR_VALID_P(glyph) \
-  ((GLYPH) (FAST_GLYPH_CHAR (glyph)) <= MAX_CHAR)
+#define GLYPH_CHAR_VALID_P(glyph) CHAR_VALID_P (FAST_GLYPH_CHAR (glyph), 1)
 
 /* The ID of the mode line highlighting face.  */
 #define GLYPH_MODE_LINE_FACE 1
@@ -1507,12 +1506,15 @@ extern void defvar_kboard P_ ((char *, int));
       form.
 
    Otherwise, the element is a variable binding.
+   
    If the symbol field is a symbol, it is an ordinary variable binding.
-   Otherwise, it should be a structure (SYMBOL BUFFER . BUFFER),
-   which represents having bound BUFFER's local value,
-   or (SYMBOL nil . BUFFER), which represents having bound the default
-   value when BUFFER was current (buffer not having any local binding
-   for SYMBOL).  */
+   
+   Otherwise, it should be a structure (SYMBOL WHERE
+   . CURRENT-BUFFER), which means having bound a local value while
+   CURRENT-BUFFER was active.  If WHERE is nil this means we saw the
+   default value when binding SYMBOL.  WHERE being a buffer or frame
+   means we saw a buffer-local or frame-local value.  Other values of
+   WHERE mean an internal error.  */
 
 struct specbinding
   {
@@ -2590,6 +2592,9 @@ extern void syms_of_casetab P_ ((void));
 
 /* defined in keyboard.c */
 
+extern int echoing;
+extern Lisp_Object echo_message_buffer;
+extern void cancel_echoing P_ ((void));
 extern Lisp_Object Qdisabled, QCfilter;
 extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level;
 extern int input_pending;