(Funintern): Comment out last change.

2 files changed, 11 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7fb2eb208d7..eeceb7b767d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (Funintern): Comment out last change.
+
 2009-11-19  Richard Stallman  <rms@gnu.org>
 
         * lread.c (Funintern): Error if symbol is t or nil.
@@ -193,7 +197,7 @@
 
 2009-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * 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  <jan.h.d@swipnet.se>
 
diff --git a/src/lread.c b/src/lread.c
index ecece80229a..c565ce9fd5d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3765,8 +3765,12 @@ OBARRAY defaults to the value of the variable `obarray'.  */)
   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;