[AC21.4] revert derived-mode-merge-syntax-tables patch

RECOMMEND 21.4 The original patch apparently slipped into 21.4 inadvertantly (see <87r7hobebk.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; on XEmacs Beta). This reverts. Note that Jerry's test in <pslluyhzan.fsf(a)diannao.ittc.ku.edu&gt; http://list-archive.xemacs.org/xemacs-beta/200307/msg00153.html is 99% incorrect; `push' will always return non-nil, causing `map-char-table' to exit after one iteration. It should be (let ((keyval nil)) (map-char-table #'(lambda (key value) (push (list key value) keyval) ;; force null return nil) (make-syntax-table)) keyval) Jerry's version still shows that map-char-table in 21.5 is broken, because the test should return a one-element list, and it doesn't. The revised version of derived.el DTRT's on this test: (require 'jde) (let ((my-syntax-table (make-syntax-table))) (derived-mode-merge-syntax-tables java-mode-syntax-table my-syntax-table) my-syntax-table) and cannot throw the wrong-type error Hrvoje observes, so I recommend application. Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.515 diff -u -U0 -r1.515 ChangeLog --- lisp/ChangeLog 17 Jul 2003 14:41:23 -0000 1.515 +++ lisp/ChangeLog 18 Jul 2003 07:19:59 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-04-06 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * derived.el (derived-mode-merge-syntax-tables): + Revert my 21.5-only patch of 2003-07-18 which slipped in + through Jerry James's patch of 2004-06-07. +