--- a/tests/automated/symbol-tests.el	Mon Aug 13 11:19:22 2007 +0200
+++ b/tests/automated/symbol-tests.el	Mon Aug 13 11:20:41 2007 +0200
@@ -1,7 +1,7 @@
 ;; Copyright (C) 1999 Free Software Foundation, Inc.
 
-;; Author: Hrvoje Niksic <hniksic@xemacs.org>
-;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org>
+;; Author: Hrvoje Niksic <hniksic@srce.hr>
+;; Maintainer: Hrvoje Niksic <hniksic@srce.hr>
 ;; Created: 1999
 ;; Keywords: tests
 
@@ -250,70 +250,33 @@
 ;; Magic symbols
 ;;-----------------------------------------------------
 
-;; Magic symbols are only half implemented.  However, a subset of the
-;; functionality is being used to implement backward compatibility or
-;; clearer error messages for new features such as specifiers and
-;; glyphs.  These tests try to test that working subset.
+;; Magic symbols are almost totally unimplemented.  However, a
+;; rudimentary subset of the functionality is being used to implement
+;; backward compatibility or clearer error messages for new features
+;; such as specifiers and glyphs.  These tests try to test that
+;; working subset.
 
-(let ((mysym (make-symbol "test-symbol"))
-      save)
+(let ((mysym (make-symbol "test-symbol")))
   (dontusethis-set-symbol-value-handler
    mysym
    'set-value
    (lambda (&rest args)
      (throw 'test-tag args)))
-  (Assert (not (boundp mysym)))
   (Assert (equal (catch 'test-tag
 		   (set mysym 'foo))
-		 `(,mysym (foo) set nil nil)))
-  (Assert (not (boundp mysym)))
-  (dontusethis-set-symbol-value-handler
-   mysym
-   'set-value
-   (lambda (&rest args) (setq save (nth 1 args))))
-  (set mysym 'foo)
-  (Assert (equal save '(foo)))
-  (Assert (eq (symbol-value mysym) 'foo))
-  )
+		 `(,mysym (foo) set nil nil))))
+
+;; #### These two make XEmacs crash!
 
-(let ((mysym (make-symbol "test-symbol"))
-      save)
-  (dontusethis-set-symbol-value-handler
-   mysym
-   'make-unbound
-   (lambda (&rest args)
-     (throw 'test-tag args)))
-  (Assert (equal (catch 'test-tag
-		   (makunbound mysym))
-		 `(,mysym nil makunbound nil nil)))
-  (dontusethis-set-symbol-value-handler
-   mysym
-   'make-unbound
-   (lambda (&rest args) (setq save (nth 2 args))))
-  (Assert (not (boundp mysym)))
-  (set mysym 'bar)
-  (Assert (null save))
-  (Assert (eq (symbol-value mysym) 'bar))
-  (makunbound mysym)
-  (Assert (not (boundp mysym)))
-  (Assert (eq save 'makunbound))
-  )
-
-(when (featurep 'file-coding)
-  (Assert (eq pathname-coding-system file-name-coding-system))
-  (let ((val1 file-name-coding-system)
-	(val2 pathname-coding-system))
-    (Assert (eq val1 val2))
-    (let ((file-name-coding-system 'no-conversion-dos))
-      (Assert (eq file-name-coding-system 'no-conversion-dos))
-      (Assert (eq pathname-coding-system file-name-coding-system)))
-    (let ((pathname-coding-system 'no-conversion-mac))
-      (Assert (eq file-name-coding-system 'no-conversion-mac))
-      (Assert (eq pathname-coding-system file-name-coding-system)))
-    (Assert (eq file-name-coding-system pathname-coding-system))
-    (Assert (eq val1 file-name-coding-system)))
-  (Assert (eq pathname-coding-system file-name-coding-system)))
-
+;(let ((mysym (make-symbol "test-symbol")))
+;  (dontusethis-set-symbol-value-handler
+;   mysym
+;   'make-unbound
+;   (lambda (&rest args)
+;     (throw 'test-tag args)))
+;  (Assert (equal (catch 'test-tag
+;		   (set mysym 'foo))
+;		 `(,mysym (foo) set nil nil))))
 
 ;(let ((mysym (make-symbol "test-symbol")))
 ;  (dontusethis-set-symbol-value-handler
@@ -323,4 +286,4 @@
 ;     (throw 'test-tag args)))
 ;  (Assert (equal (catch 'test-tag
 ;		   (set mysym 'foo))
-;		 `(,mysym (foo) make-local nil nil))))
+;		 `(,mysym (foo) set nil nil))))