[Emacs-diffs] emacs/src ChangeLog lread.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/19 22:10:42

Modified files:
        src            : ChangeLog lread.c 

Log message:
        (Funintern): Comment out last change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7882&r2=1.7883
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lread.c?cvsroot=emacs&r1=1.419&r2=1.420

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7882
retrieving revision 1.7883
diff -u -b -r1.7882 -r1.7883
--- ChangeLog   19 Nov 2009 16:13:22 -0000      1.7882
+++ ChangeLog   19 Nov 2009 22:10:40 -0000      1.7883
@@ -1,3 +1,7 @@
+2009-11-19  Stefan Monnier  <address@hidden>
+
+       * lread.c (Funintern): Comment out last change.
+
 2009-11-19  Richard Stallman  <address@hidden>
 
        * lread.c (Funintern): Error if symbol is t or nil.
@@ -193,7 +197,7 @@
 
 2009-11-10  Stefan Monnier  <address@hidden>
 
-       * fns.c (Fplist_get): Merge the active and the uncommented code.
+       * fns.c (Fplist_get): Merge the active and the commented out code.
 
 2009-11-10  Jan Djärv  <address@hidden>
 

Index: lread.c
===================================================================
RCS file: /sources/emacs/emacs/src/lread.c,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -b -r1.419 -r1.420
--- lread.c     19 Nov 2009 16:13:23 -0000      1.419
+++ lread.c     19 Nov 2009 22:10:41 -0000      1.420
@@ -3765,8 +3765,12 @@
   if (SYMBOLP (name) && !EQ (name, tem))
     return Qnil;
 
-  if (EQ (tem, Qnil) || EQ (tem, Qt))
-    error ("Attempt to unintern t or nil");
+  /* There are plenty of other symbols which will screw up the Emacs
+     session if we unintern them, as well as even more ways to use
+     `setq' or `fset' or whatnot to make the Emacs session
+     unusable.  Let's not go down this silly road.  --Stef  */
+  /* if (EQ (tem, Qnil) || EQ (tem, Qt))
+       error ("Attempt to unintern t or nil"); */
 
   XSYMBOL (tem)->interned = SYMBOL_UNINTERNED;
   XSYMBOL (tem)->constant = 0;