changeset 2142:eb65d362090f

[xemacs-hg @ 2004-06-18 15:48:38 by james] Put the args to derived-mode-merge-syntax-tables in the right order.
author james
date Fri, 18 Jun 2004 15:48:38 +0000
parents 6bca5896aab2
children 229f3a754a18
files lisp/ChangeLog lisp/derived.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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))