# HG changeset patch
# User james
# Date 1087573718 0
# Node ID eb65d362090fd206b95ade66bc329b13810c5625
# Parent  6bca5896aab2d6edcf6449d4ea49189434b90f0c
[xemacs-hg @ 2004-06-18 15:48:38 by james]
Put the args to derived-mode-merge-syntax-tables in the right order.

diff -r 6bca5896aab2 -r eb65d362090f lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 18 07:18:40 2004 +0000
+++ b/lisp/ChangeLog	Fri Jun 18 15:48:38 2004 +0000
@@ -1,3 +1,8 @@
+2004-06-18  Jerry James  <james@xemacs.org>
+
+	* derived.el (define-derived-mode): Put the arguments to
+	derived-mode-merge-syntax-tables in the correct order.
+
 2004-06-17  Jerry James  <james@xemacs.org>
 
 	* derived.el (define-derived-mode): XEmacs does not have
diff -r 6bca5896aab2 -r eb65d362090f lisp/derived.el
--- a/lisp/derived.el	Fri Jun 18 07:18:40 2004 +0000
+++ b/lisp/derived.el	Fri Jun 18 15:48:38 2004 +0000
@@ -224,7 +224,7 @@
 		,(when declare-syntax
 		   ;; XEmacs change: we do not have char-table-parent
 		   `(derived-mode-merge-syntax-tables
-		     ,syntax (syntax-table)))))
+		     (syntax-table) ,syntax))))
 
 	  (use-local-map ,map)
 	  ,(when syntax `(set-syntax-table ,syntax))