aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/conf_post.h6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fffb0e81a0a..3f67e37a107 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-07-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * conf_post.h (RE_TRANSLATE_P) [emacs]: Remove obsolete optimization.
4
12013-07-19 Eli Zaretskii <eliz@gnu.org> 52013-07-19 Eli Zaretskii <eliz@gnu.org>
2 6
3 * keyboard.c (kbd_buffer_get_event): Use Display_Info instead of 7 * keyboard.c (kbd_buffer_get_event): Use Display_Info instead of
diff --git a/src/conf_post.h b/src/conf_post.h
index b19456749a2..16714076f6f 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -160,13 +160,7 @@ extern void _DebPrint (const char *fmt, ...);
160/* Tell regex.c to use a type compatible with Emacs. */ 160/* Tell regex.c to use a type compatible with Emacs. */
161#define RE_TRANSLATE_TYPE Lisp_Object 161#define RE_TRANSLATE_TYPE Lisp_Object
162#define RE_TRANSLATE(TBL, C) char_table_translate (TBL, C) 162#define RE_TRANSLATE(TBL, C) char_table_translate (TBL, C)
163#ifdef make_number
164/* If make_number is a macro, use it. */
165#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0))) 163#define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
166#else
167/* If make_number is a function, avoid it. */
168#define RE_TRANSLATE_P(TBL) (!(INTEGERP (TBL) && XINT (TBL) == 0))
169#endif
170#endif 164#endif
171 165
172#include <string.h> 166#include <string.h>