diff src/general-slots.h @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 3ba90c659d01
children 8431b52e43b1
line wrap: on
line diff
--- a/src/general-slots.h	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/general-slots.h	Sat Dec 26 21:18:49 2009 -0600
@@ -73,6 +73,7 @@
 SYMBOL_KEYWORD (Q_callback_ex);
 SYMBOL (Qcancel);
 SYMBOL (Qcategory);
+SYMBOL (Qccl_program);
 SYMBOL (Qcenter);
 SYMBOL (Qchain);
 SYMBOL (Qchange);
@@ -115,6 +116,7 @@
 SYMBOL (Qdynarr_overhead);
 SYMBOL (Qemergency);
 SYMBOL (Qempty);
+SYMBOL (Qencode_as_utf_8);
 SYMBOL (Qeq);
 SYMBOL (Qeql);
 SYMBOL (Qequal);
@@ -128,12 +130,14 @@
 SYMBOL (Qfile);
 SYMBOL_MODULE_API (Qfile_name);
 SYMBOL_KEYWORD (Q_filter);
+SYMBOL (Qfinal);
 SYMBOL (Qfixnum);
 SYMBOL (Qfloat);
 SYMBOL (Qfont);
 SYMBOL (Qframe);
 SYMBOL (Qframes);
 SYMBOL (Qfrom_page);
+SYMBOL (Qfrom_unicode);
 SYMBOL (Qfull_assoc);
 SYMBOL (Qfuncall);
 SYMBOL (Qfunction);
@@ -155,6 +159,7 @@
 SYMBOL (Qicon);
 SYMBOL (Qid);
 SYMBOL (Qignore);
+SYMBOL (Qinitial);
 SYMBOL (Qimage);
 SYMBOL_KEYWORD (Q_image);
 SYMBOL_KEYWORD (Q_included);
@@ -231,6 +236,8 @@
 SYMBOL (Qprocess);
 SYMBOL_KEYWORD (Q_properties);
 SYMBOL (Qprovide);
+SYMBOL (Qquery_coding_clear_highlights);
+SYMBOL (Qquery_coding_warning_face);
 SYMBOL (Qquestion);
 SYMBOL_KEYWORD (Q_question);
 SYMBOL (Qradio);
@@ -263,6 +270,7 @@
 SYMBOL_KEYWORD (Q_style);
 SYMBOL_KEYWORD (Q_suffix);
 SYMBOL (Qsubtype);
+SYMBOL (Qsucceeded);
 SYMBOL (Qsymbol);
 SYMBOL (Qsyntax);
 SYMBOL (Qsystem_default);
@@ -283,7 +291,11 @@
 SYMBOL (Qtype);
 SYMBOL (Qundecided);
 SYMBOL (Qundefined);
+SYMBOL (Qunencodable);
+SYMBOL (Qinvalid_sequence);
 SYMBOL (Qunimplemented);
+SYMBOL (Qunicode_registries);
+SYMBOL (Qunicode_type);
 SYMBOL (Quser_default);
 SYMBOL_KEYWORD (Q_value);
 SYMBOL (Qvalue_assoc);