Mercurial > hg > xemacs-beta

diff lisp/derived.el @ 2140:9da6e6c569f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-06-18 04:06:49 by james] Don't try to use nonexistent function char-table-parent.
author james
date Fri, 18 Jun 2004 04:06:50 +0000
parents e6d43c299b9c
children eb65d362090f
line wrap: on
line diff
--- a/lisp/derived.el	Thu Jun 17 21:50:34 2004 +0000
+++ b/lisp/derived.el	Fri Jun 18 04:06:50 2004 +0000
@@ -220,12 +220,11 @@
 			 (get (quote ,parent) 'mode-class)))
 					; Set up maps and tables.
 		(unless (keymap-parent ,map)
-		  (set-keymap-parent ,map (current-local-map)))
+		  (set-keymap-parents ,map (list (current-local-map))))
 		,(when declare-syntax
-		   `(let ((parent (char-table-parent ,syntax)))
-		      (unless (and parent
-				   (not (eq parent (standard-syntax-table))))
-			(set-char-table-parent ,syntax (syntax-table)))))))
+		   ;; XEmacs change: we do not have char-table-parent
+		   `(derived-mode-merge-syntax-tables
+		     ,syntax (syntax-table)))))
 
 	  (use-local-map ,map)
 	  ,(when syntax `(set-syntax-table ,syntax))