* xdisp.c (Qglyphless_char): Now static.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8713d493dca630e33153d7169d9938a45f322004..26b1a54ffc88ae94262680c086d48415473e3fb6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2013-10-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xdisp.c (Qglyphless_char): Now static.
+
        Adjust to merge from gnulib.
        * conf_post.h (__has_builtin, assume): Remove; gnulib now does these.
        * lisp.h: Include <verify.h>, for 'assume'.

diff --git a/src/lisp.h b/src/lisp.h
index ee83e227db0192101dca26f85f5882ec82c34342..0556a95f3653995f21e4ba3f146dee9228f96edd 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3389,7 +3389,6 @@ 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 QCdata, QCfile;
 extern Lisp_Object QCmap;
 extern Lisp_Object Qrisky_local_variable;

diff --git a/src/xdisp.c b/src/xdisp.c
index d348b1cc67e5512f7575fb113e6362eead8852a7..02f775bfbfbe9cc2e4a648f1d9a8bc89c53db931 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -751,7 +751,7 @@ struct atimer *hourglass_atimer;
 #endif /* HAVE_WINDOW_SYSTEM */
 
 /* Name of the face used to display glyphless characters.  */
-Lisp_Object Qglyphless_char;
+static Lisp_Object Qglyphless_char;
 
 /* Symbol for the purpose of Vglyphless_char_display.  */
 static Lisp_Object Qglyphless_char_display;