From ead45345b1c561f9f0577733757a9ff7a42ab0ff Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 3 Oct 2013 06:55:28 -0700 Subject: [PATCH] * xdisp.c (Qglyphless_char): Now static. --- src/ChangeLog | 2 ++ src/lisp.h | 1 - src/xdisp.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8713d493dc..26b1a54ffc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2013-10-03 Paul Eggert + * 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 , for 'assume'. diff --git a/src/lisp.h b/src/lisp.h index ee83e227db..0556a95f36 100644 --- 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 d348b1cc67..02f775bfbf 100644 --- 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; -- 2.20.1