summaryrefslogtreecommitdiff
path: root/src/fontset.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-06-08 10:33:34 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-06-08 11:50:42 -0700
commit82f49c6a373f981a778f4d939ca2d47c031e0659 (patch)
treee84afa8e7af336f15f37789fbf23f4ec62905790 /src/fontset.c
parent7715ee54b3588cfdef03b5d45aaf44b73b422ec6 (diff)
downloademacs-82f49c6a373f981a778f4d939ca2d47c031e0659.tar.gz
Replace IF_LINT by NONVOLATILE and UNINIT
Inspired by a suggestion from RMS in: http://bugs.gnu.org/23640#58 * .dir-locals.el (c-mode): Adjust to macro changes. * src/conf_post.h (NONVOLATILE, UNINIT): New macros (Bug#23640). (IF_LINT): Remove. All uses replaced by the new macros.
Diffstat (limited to 'src/fontset.c')
-rw-r--r--src/fontset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c
index d87901d42b8..81528de55a0 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -750,7 +750,8 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face,
static Lisp_Object
fontset_font (Lisp_Object fontset, int c, struct face *face, int id)
{
- Lisp_Object rfont_def, default_rfont_def IF_LINT (= Qnil);
+ Lisp_Object rfont_def;
+ Lisp_Object default_rfont_def UNINIT;
Lisp_Object base_fontset;
/* Try a font-group of FONTSET. */