diff src/data.c @ 83548:c71725faff1a

Merged from [e-mail]. Last-minute emacsclient rewrites be damned! Patches applied: * [e-mail]/emacs--devo--0--patch-490 Update from CVS * [e-mail]/emacs--devo--0--patch-491 Update from CVS * [e-mail]/emacs--devo--0--patch-492 Update from CVS * [e-mail]/emacs--devo--0--patch-493 Update from CVS * [e-mail]/emacs--devo--0--patch-494 Update from CVS * [e-mail]/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-496 Update from CVS * [e-mail]/emacs--devo--0--patch-497 Update from CVS * [e-mail]/emacs--devo--0--patch-498 Update from CVS * [e-mail]/emacs--devo--0--patch-499 Update from CVS * [e-mail]/emacs--devo--0--patch-500 Update from CVS * [e-mail]/emacs--devo--0--patch-501 Update from CVS * [e-mail]/emacs--devo--0--patch-502 Update from CVS * [e-mail]/emacs--devo--0--patch-503 Update from CVS * [e-mail]/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-505 Update from CVS * [e-mail]/emacs--devo--0--patch-506 Update from CVS * [e-mail]/emacs--devo--0--patch-507 Update from CVS * [e-mail]/emacs--devo--0--patch-508 Update from CVS * [e-mail]/emacs--devo--0--patch-509 Update from CVS * [e-mail]/emacs--devo--0--patch-510 Update from CVS * [e-mail]/emacs--devo--0--patch-511 Update from CVS * [e-mail]/emacs--devo--0--patch-512 Update from CVS * [e-mail]/emacs--devo--0--patch-513 Update from CVS * [e-mail]/emacs--devo--0--patch-514 Update from CVS * [e-mail]/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-516 Update from CVS * [e-mail]/emacs--devo--0--patch-517 Update from CVS * [e-mail]/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * [e-mail]/emacs--devo--0--patch-520 Merge from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-521 Update from CVS * [e-mail]/emacs--devo--0--patch-522 Update from CVS * [e-mail]/emacs--devo--0--patch-523 Update from CVS * [e-mail]/emacs--devo--0--patch-524 Update from CVS * [e-mail]/emacs--devo--0--patch-525 Update from CVS * [e-mail]/emacs--devo--0--patch-526 Update from CVS * [e-mail]/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-528 Update from CVS * [e-mail]/emacs--devo--0--patch-529 Update from CVS * [e-mail]/emacs--devo--0--patch-530 Update from CVS * [e-mail]/emacs--devo--0--patch-531 Update from CVS * [e-mail]/emacs--devo--0--patch-532 Update from CVS * [e-mail]/emacs--devo--0--patch-533 Update from CVS * [e-mail]/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-535 Update from CVS * [e-mail]/gnus--rel--5.10--patch-161 Update from CVS * [e-mail]/gnus--rel--5.10--patch-162 Update from CVS * [e-mail]/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-164 Update from CVS * [e-mail]/gnus--rel--5.10--patch-165 Update from CVS * [e-mail]/gnus--rel--5.10--patch-166 Update from CVS * [e-mail]/gnus--rel--5.10--patch-167 Update from CVS * [e-mail]/gnus--rel--5.10--patch-168 Update from CVS * [e-mail]/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-588

--- a/src/data.c	Sun Dec 03 12:36:08 2006 +0000
+++ b/src/data.c	Sun Dec 03 15:03:30 2006 +0000
@@ -607,7 +607,7 @@
      register Lisp_Object symbol;
 {
   CHECK_SYMBOL (symbol);
-  if (XSYMBOL (symbol)->constant)
+  if (SYMBOL_CONSTANT_P (symbol))
     xsignal1 (Qsetting_constant, symbol);
   Fset (symbol, Qunbound);
   return symbol;
@@ -2884,7 +2884,7 @@
 DEFUN ("logxor", Flogxor, Slogxor, 0, MANY, 0,
        doc: /* Return bitwise-exclusive-or of all the arguments.
 Arguments may be integers, or markers converted to integers.
-usage: (logxor &rest INTS-OR-MARKERS) */)
+usage: (logxor &rest INTS-OR-MARKERS)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;