Mercurial > hg > xemacs-beta

diff src/emacsfns.h @ 207:e45d5e7c476e r20-4b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b2
author cvs
date Mon, 13 Aug 2007 10:03:52 +0200
parents acd284d43ca1
children 2c611d1463a6
line wrap: on
line diff
--- a/src/emacsfns.h	Mon Aug 13 10:02:48 2007 +0200
+++ b/src/emacsfns.h	Mon Aug 13 10:03:52 2007 +0200
@@ -329,7 +329,9 @@
 #ifndef make_int
 Lisp_Object make_int (EMACS_INT);
 #endif
+#ifndef make_char
 Lisp_Object make_char (Emchar num);
+#endif
 DECLARE_DOESNT_RETURN (pure_write_error (void));
 DECLARE_DOESNT_RETURN (args_out_of_range (Lisp_Object, Lisp_Object));
 DECLARE_DOESNT_RETURN (args_out_of_range_3 (Lisp_Object, Lisp_Object,
@@ -1172,7 +1174,7 @@
 extern Lisp_Object Qassoc;
 extern Lisp_Object Qat;
 extern Lisp_Object Qautodetect;
-extern Lisp_Object Qautomatic_conversion;
+extern Lisp_Object Qundecided;
 extern Lisp_Object Qbad_variable;
 extern Lisp_Object Qbefore;
 extern Lisp_Object Qbinary;