From: Paul Eggert Date: Thu, 3 Oct 2013 13:55:28 +0000 (-0700) Subject: * xdisp.c (Qglyphless_char): Now static. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1400 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ead45345b1c561f9f0577733757a9ff7a42ab0ff;p=emacs.git * xdisp.c (Qglyphless_char): Now static. --- diff --git a/src/ChangeLog b/src/ChangeLog index 8713d493dca..26b1a54ffc8 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 ee83e227db0..0556a95f365 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 d348b1cc67e..02f775bfbfb 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;