diff options
| author | Paul Eggert | 2013-10-03 06:55:28 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-10-03 06:55:28 -0700 |
| commit | ead45345b1c561f9f0577733757a9ff7a42ab0ff (patch) | |
| tree | 751d3f8a8b0b68e010b03b10051b97c93f99a623 /src | |
| parent | 8a3fafec9bfc4029c606ec857bf9a51bc400b622 (diff) | |
| download | emacs-ead45345b1c561f9f0577733757a9ff7a42ab0ff.tar.gz emacs-ead45345b1c561f9f0577733757a9ff7a42ab0ff.zip | |
* xdisp.c (Qglyphless_char): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/lisp.h | 1 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8713d493dca..26b1a54ffc8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-10-03 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2013-10-03 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xdisp.c (Qglyphless_char): Now static. | ||
| 4 | |||
| 3 | Adjust to merge from gnulib. | 5 | Adjust to merge from gnulib. |
| 4 | * conf_post.h (__has_builtin, assume): Remove; gnulib now does these. | 6 | * conf_post.h (__has_builtin, assume): Remove; gnulib now does these. |
| 5 | * lisp.h: Include <verify.h>, for 'assume'. | 7 | * lisp.h: Include <verify.h>, 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; | |||
| 3389 | extern Lisp_Object Qspace, Qcenter, QCalign_to; | 3389 | extern Lisp_Object Qspace, Qcenter, QCalign_to; |
| 3390 | extern Lisp_Object Qbar, Qhbar, Qbox, Qhollow; | 3390 | extern Lisp_Object Qbar, Qhbar, Qbox, Qhollow; |
| 3391 | extern Lisp_Object Qleft_margin, Qright_margin; | 3391 | extern Lisp_Object Qleft_margin, Qright_margin; |
| 3392 | extern Lisp_Object Qglyphless_char; | ||
| 3393 | extern Lisp_Object QCdata, QCfile; | 3392 | extern Lisp_Object QCdata, QCfile; |
| 3394 | extern Lisp_Object QCmap; | 3393 | extern Lisp_Object QCmap; |
| 3395 | extern Lisp_Object Qrisky_local_variable; | 3394 | 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; | |||
| 751 | #endif /* HAVE_WINDOW_SYSTEM */ | 751 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 752 | 752 | ||
| 753 | /* Name of the face used to display glyphless characters. */ | 753 | /* Name of the face used to display glyphless characters. */ |
| 754 | Lisp_Object Qglyphless_char; | 754 | static Lisp_Object Qglyphless_char; |
| 755 | 755 | ||
| 756 | /* Symbol for the purpose of Vglyphless_char_display. */ | 756 | /* Symbol for the purpose of Vglyphless_char_display. */ |
| 757 | static Lisp_Object Qglyphless_char_display; | 757 | static Lisp_Object Qglyphless_char_display; |