2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8604cfcb29f..5e4dbb7ae1c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Spelling fixes
+        * lisp.h (DEFINE_NON_NIL_Q_SYMBOL_MACROS):
+        Rename from DEFINE_NONNIL_Q_SYMBOL_MACROS.  All uses changed.
+
 2015-02-21  Eli Zaretskii  <eliz@gnu.org>
 
         * w32term.c (queue_notifications):
diff --git a/src/lisp.h b/src/lisp.h
index 7795c90e5cc..9764b096ef0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -746,10 +746,10 @@ struct Lisp_Symbol
 
 /* By default, define macros for Qt, etc., as this leads to a bit
    better performance in the core Emacs interpreter.  A plugin can
-   define DEFINE_NONNIL_Q_SYMBOL_MACROS to be false, to be portable to
+   define DEFINE_NON_NIL_Q_SYMBOL_MACROS to be false, to be portable to
    other Emacs instances that assign different values to Qt, etc.  */
-#ifndef DEFINE_NONNIL_Q_SYMBOL_MACROS
-# define DEFINE_NONNIL_Q_SYMBOL_MACROS true
+#ifndef DEFINE_NON_NIL_Q_SYMBOL_MACROS
+# define DEFINE_NON_NIL_Q_SYMBOL_MACROS true
 #endif
 
 #include "globals.h"