Mercurial > hg > xemacs-beta
changeset 2140:9da6e6c569f7
[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 | fd22900227d7 |
| children | 6bca5896aab2 |
| files | lisp/ChangeLog lisp/derived.el |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 17 21:50:34 2004 +0000 +++ b/lisp/ChangeLog Fri Jun 18 04:06:50 2004 +0000 @@ -1,3 +1,8 @@ +2004-06-17 Jerry James <james@xemacs.org> + + * derived.el (define-derived-mode): XEmacs does not have + char-table-parent. Use derived-mode-merge-syntax-tables instead. + 2004-06-09 Stephen J. Turnbull <stephen@xemacs.org> * subr.el (split-string): Clean up docstring.
--- 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))