--- a/src/general.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/general.c	Mon Aug 13 11:13:30 2007 +0200
@@ -34,24 +34,20 @@
 Lisp_Object Qactually_requested;
 Lisp_Object Qafter;
 Lisp_Object Qall;
-Lisp_Object Qalways;
 Lisp_Object Qand;
 Lisp_Object Qassoc;
 Lisp_Object Qat;
-Lisp_Object Qauth;
 Lisp_Object Qautodetect;
 Lisp_Object Qbad_variable;
-Lisp_Object Qbase;
 Lisp_Object Qbefore;
 Lisp_Object Qbinary;
-Lisp_Object Qbinddn;
 Lisp_Object Qbitmap;
-Lisp_Object Qblack;
 Lisp_Object Qboolean;
 Lisp_Object Qbottom;
+Lisp_Object Qbottom_margin;
 Lisp_Object Qbuffer;
 Lisp_Object Qbutton;
-Lisp_Object Qcase;
+Lisp_Object Qcenter;
 Lisp_Object Qcategory;
 Lisp_Object Qchannel;
 Lisp_Object Qchar;
@@ -62,17 +58,18 @@
 Lisp_Object Qcommand;
 Lisp_Object Qconsole;
 Lisp_Object Qcritical;
+Lisp_Object Qctext;
 Lisp_Object Qcursor;
 Lisp_Object Qdata;
 Lisp_Object Qdead;
 Lisp_Object Qdefault;
 Lisp_Object Qdelete;
 Lisp_Object Qdelq;
-Lisp_Object Qderef;
 Lisp_Object Qdevice;
 Lisp_Object Qdimension;
 Lisp_Object Qdisplay;
 Lisp_Object Qdoc_string;
+Lisp_Object Qduplex;
 Lisp_Object Qdynarr_overhead;
 Lisp_Object Qempty;
 Lisp_Object Qeq;
@@ -81,7 +78,7 @@
 Lisp_Object Qeval;
 Lisp_Object Qextents;
 Lisp_Object Qface;
-Lisp_Object Qfind;
+Lisp_Object Qfile_name;
 Lisp_Object Qfont;
 Lisp_Object Qframe;
 Lisp_Object Qfunction;
@@ -89,8 +86,10 @@
 Lisp_Object Qgeneric;
 Lisp_Object Qgeometry;
 Lisp_Object Qglobal;
+Lisp_Object Qgutter;
 Lisp_Object Qheight;
 Lisp_Object Qhighlight;
+Lisp_Object Qhorizontal;
 Lisp_Object Qicon;
 Lisp_Object Qid;
 Lisp_Object Qimage;
@@ -102,23 +101,22 @@
 Lisp_Object Qkey_assoc;
 Lisp_Object Qkeyboard;
 Lisp_Object Qkeymap;
-Lisp_Object Qkrbv41;
-Lisp_Object Qkrbv42;
+Lisp_Object Qlandscape;
 Lisp_Object Qleft;
+Lisp_Object Qleft_margin;
 Lisp_Object Qlist;
 Lisp_Object Qmagic;
 Lisp_Object Qmalloc_overhead;
 Lisp_Object Qmarkers;
 Lisp_Object Qmax;
 Lisp_Object Qmemory;
-Lisp_Object Qmenubar;
 Lisp_Object Qmessage;
 Lisp_Object Qminus;
 Lisp_Object Qmodifiers;
 Lisp_Object Qmotion;
+Lisp_Object Qmsprinter;
 Lisp_Object Qmswindows;
 Lisp_Object Qname;
-Lisp_Object Qnever;
 Lisp_Object Qnone;
 Lisp_Object Qnot;
 Lisp_Object Qnothing;
@@ -129,16 +127,15 @@
 Lisp_Object Qold_delq;
 Lisp_Object Qold_rassoc;
 Lisp_Object Qold_rassq;
-Lisp_Object Qonelevel;
 Lisp_Object Qonly;
 Lisp_Object Qor;
+Lisp_Object Qorientation;
 Lisp_Object Qother;
-Lisp_Object Qpasswd;
-Lisp_Object Qpath;
 Lisp_Object Qpointer;
 Lisp_Object Qpopup;
-Lisp_Object Qport;
+Lisp_Object Qportrait;
 Lisp_Object Qprint;
+Lisp_Object Qprinter;
 Lisp_Object Qprocess;
 Lisp_Object Qprovide;
 Lisp_Object Qrassoc;
@@ -148,35 +145,34 @@
 Lisp_Object Qreturn;
 Lisp_Object Qreverse;
 Lisp_Object Qright;
+Lisp_Object Qright_margin;
 Lisp_Object Qsearch;
 Lisp_Object Qselected;
 Lisp_Object Qsignal;
 Lisp_Object Qsimple;
 Lisp_Object Qsize;
-Lisp_Object Qsizelimit;
 Lisp_Object Qspace;
 Lisp_Object Qspecifier;
 Lisp_Object Qstream;
 Lisp_Object Qstring;
-Lisp_Object Qsubtree;
 Lisp_Object Qsymbol;
 Lisp_Object Qsyntax;
+Lisp_Object Qterminal;
 Lisp_Object Qtest;
 Lisp_Object Qtext;
-Lisp_Object Qtimelimit;
 Lisp_Object Qtimeout;
 Lisp_Object Qtimestamp;
 Lisp_Object Qtoolbar;
 Lisp_Object Qtop;
+Lisp_Object Qtop_margin;
 Lisp_Object Qtty;
 Lisp_Object Qtype;
 Lisp_Object Qundecided;
 Lisp_Object Qundefined;
 Lisp_Object Qunimplemented;
 Lisp_Object Qvalue_assoc;
-Lisp_Object Qvector;
+Lisp_Object Qvertical;
 Lisp_Object Qwarning;
-Lisp_Object Qwhite;
 Lisp_Object Qwidth;
 Lisp_Object Qwidget;
 Lisp_Object Qwindow;
@@ -190,25 +186,21 @@
   defsymbol (&Qactually_requested, "actually-requested");
   defsymbol (&Qafter, "after");
   defsymbol (&Qall, "all");
-  defsymbol (&Qalways, "always");
   defsymbol (&Qand, "and");
   defsymbol (&Qassoc, "assoc");
   defsymbol (&Qat, "at");
-  defsymbol (&Qauth, "auth");
   defsymbol (&Qautodetect, "autodetect");
   defsymbol (&Qbad_variable, "bad-variable");
-  defsymbol (&Qbase, "base");
   defsymbol (&Qbefore, "before");
   defsymbol (&Qbinary, "binary");
-  defsymbol (&Qbinddn, "binddn");
   defsymbol (&Qbitmap, "bitmap");
-  defsymbol (&Qblack, "black");
   defsymbol (&Qboolean, "boolean");
   defsymbol (&Qbottom, "bottom");
+  defsymbol (&Qbottom_margin, "bottom-margin");
   defsymbol (&Qbuffer, "buffer");
   defsymbol (&Qbutton, "button");
-  defsymbol (&Qcase, "case");
   defsymbol (&Qcategory, "category");
+  defsymbol (&Qcenter, "center");
   defsymbol (&Qchannel, "channel");
   defsymbol (&Qchar, "char");
   defsymbol (&Qcharacter, "character");
@@ -218,17 +210,18 @@
   defsymbol (&Qcommand, "command");
   defsymbol (&Qconsole, "console");
   defsymbol (&Qcritical, "critical");
+  defsymbol (&Qctext, "ctext");
   defsymbol (&Qcursor, "cursor");
   defsymbol (&Qdata, "data");
   defsymbol (&Qdead, "dead");
   defsymbol (&Qdefault, "default");
   defsymbol (&Qdelete, "delete");
   defsymbol (&Qdelq, "delq");
-  defsymbol (&Qderef, "deref");
   defsymbol (&Qdevice, "device");
   defsymbol (&Qdimension, "dimension");
   defsymbol (&Qdisplay, "display");
   defsymbol (&Qdoc_string, "doc-string");
+  defsymbol (&Qduplex, "duplex");
   defsymbol (&Qdynarr_overhead, "dynarr-overhead");
   defsymbol (&Qempty, "empty");
   defsymbol (&Qeq, "eq");
@@ -237,7 +230,7 @@
   defsymbol (&Qeval, "eval");
   defsymbol (&Qextents, "extents");
   defsymbol (&Qface, "face");
-  defsymbol (&Qfind, "find");
+  defsymbol (&Qfile_name, "file-name");
   defsymbol (&Qfont, "font");
   defsymbol (&Qframe, "frame");
   defsymbol (&Qfunction, "function");
@@ -245,8 +238,10 @@
   defsymbol (&Qgeneric, "generic");
   defsymbol (&Qgeometry, "geometry");
   defsymbol (&Qglobal, "global");
+  defsymbol (&Qgutter, "gutter");
   defsymbol (&Qheight, "height");
   defsymbol (&Qhighlight, "highlight");
+  defsymbol (&Qhorizontal, "horizontal");
   defsymbol (&Qicon, "icon");
   defsymbol (&Qid, "id");
   defsymbol (&Qimage, "image");
@@ -258,23 +253,22 @@
   defsymbol (&Qkey_assoc, "key-assoc");
   defsymbol (&Qkeyboard, "keyboard");
   defsymbol (&Qkeymap, "keymap");
-  defsymbol (&Qkrbv41, "krbv41");
-  defsymbol (&Qkrbv42, "krbv42");
+  defsymbol (&Qlandscape, "landscape");
   defsymbol (&Qleft, "left");
+  defsymbol (&Qleft_margin, "left-margin");
   defsymbol (&Qlist, "list");
   defsymbol (&Qmagic, "magic");
   defsymbol (&Qmalloc_overhead, "malloc-overhead");
   defsymbol (&Qmarkers, "markers");
   defsymbol (&Qmax, "max");
   defsymbol (&Qmemory, "memory");
-  defsymbol (&Qmenubar, "menubar");
   defsymbol (&Qmessage, "message");
   defsymbol (&Qminus, "-");
   defsymbol (&Qmodifiers, "modifiers");
   defsymbol (&Qmotion, "motion");
+  defsymbol (&Qmsprinter, "msprinter");
   defsymbol (&Qmswindows, "mswindows");
   defsymbol (&Qname, "name");
-  defsymbol (&Qnever, "never");
   defsymbol (&Qnone, "none");
   defsymbol (&Qnot, "not");
   defsymbol (&Qnothing, "nothing");
@@ -285,16 +279,15 @@
   defsymbol (&Qold_delq, "old-delq");
   defsymbol (&Qold_rassoc, "old-rassoc");
   defsymbol (&Qold_rassq, "old-rassq");
-  defsymbol (&Qonelevel, "onelevel");
   defsymbol (&Qonly, "only");
   defsymbol (&Qor, "or");
+  defsymbol (&Qorientation, "orientation");
   defsymbol (&Qother, "other");
-  defsymbol (&Qpasswd, "passwd");
-  defsymbol (&Qpath, "path");
   defsymbol (&Qpointer, "pointer");
   defsymbol (&Qpopup, "popup");
-  defsymbol (&Qport, "port");
+  defsymbol (&Qportrait, "portrait");
   defsymbol (&Qprint, "print");
+  defsymbol (&Qprinter, "printer");
   defsymbol (&Qprocess, "process");
   defsymbol (&Qprovide, "provide");
   defsymbol (&Qrassoc, "rassoc");
@@ -304,35 +297,34 @@
   defsymbol (&Qreturn, "return");
   defsymbol (&Qreverse, "reverse");
   defsymbol (&Qright, "right");
+  defsymbol (&Qright_margin, "right-margin");
   defsymbol (&Qsearch, "search");
   defsymbol (&Qselected, "selected");
   defsymbol (&Qsignal, "signal");
   defsymbol (&Qsimple, "simple");
   defsymbol (&Qsize, "size");
-  defsymbol (&Qsizelimit, "sizelimit");
   defsymbol (&Qspace, "space");
   defsymbol (&Qspecifier, "specifier");
   defsymbol (&Qstream, "stream");
   defsymbol (&Qstring, "string");
-  defsymbol (&Qsubtree, "subtree");
   defsymbol (&Qsymbol, "symbol");
   defsymbol (&Qsyntax, "syntax");
+  defsymbol (&Qterminal, "terminal");
   defsymbol (&Qtest, "test");
   defsymbol (&Qtext, "text");
-  defsymbol (&Qtimelimit, "timelimit");
   defsymbol (&Qtimeout, "timeout");
   defsymbol (&Qtimestamp, "timestamp");
   defsymbol (&Qtoolbar, "toolbar");
   defsymbol (&Qtop, "top");
+  defsymbol (&Qtop_margin, "top-margin");
   defsymbol (&Qtty, "tty");
   defsymbol (&Qtype, "type");
   defsymbol (&Qundecided, "undecided");
   defsymbol (&Qundefined, "undefined");
   defsymbol (&Qunimplemented, "unimplemented");
   defsymbol (&Qvalue_assoc, "value-assoc");
-  defsymbol (&Qvector, "vector");
+  defsymbol (&Qvertical, "vertical");
   defsymbol (&Qwarning, "warning");
-  defsymbol (&Qwhite, "white");
   defsymbol (&Qwidth, "width");
   defsymbol (&Qwidget, "widget");
   defsymbol (&Qwindow, "window");