changeset: 4409:b03b5e362fcff61ac4632834ea16615407c1264b parent: 4408:cacc942c0d0ff698ddad402df54e0fed35425b09 parent: 4407:f6c39b2d8b6227405501091559be63ca54161c31 user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Tue Jan 15 21:35:41 2008 +0100 files: description: Automated merge with file:/Sources/xemacs-21.5-checked-out diff -r cacc942c0d0ff698ddad402df54e0fed35425b09 -r b03b5e362fcff61ac4632834ea16615407c1264b lisp/ChangeLog --- a/lisp/ChangeLog Tue Jan 15 21:35:01 2008 +0100 +++ b/lisp/ChangeLog Tue Jan 15 21:35:41 2008 +0100 ＠＠ -1,3 +1,17 ＠＠ 2008-01-04 Michael Sperber <mike＠xemac +2008-01-14 Jerry James <james(a)xemacs.org&gt; + + * font-lock.el (font-lock-add-keywords): Adapt to differences in + Emacs and XEmacs compiled font-lock lists. + * font-lock.el (font-lock-remove-keywords): Ditto. + * font-lock.el (font-lock-set-defaults-1): Make changes specified + by font-lock-keywords-alist and font-lock-removed-keywords-alist. + +2008-01-14 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * bytecomp.el (byte-compile-output-file-form): + Bind print-gensym-alist to nil, as we do within + byte-compile-output-docform. + 2008-01-04 Michael Sperber <mike(a)xemacs.org&gt; * code-files.el (insert-file-contents): diff -r cacc942c0d0ff698ddad402df54e0fed35425b09 -r b03b5e362fcff61ac4632834ea16615407c1264b lisp/bytecomp.el --- a/lisp/bytecomp.el Tue Jan 15 21:35:01 2008 +0100 +++ b/lisp/bytecomp.el Tue Jan 15 21:35:41 2008 +0100 ＠＠ -1888,7 +1888,8 ＠＠ With argument, insert value in current b (print-readably t) ; print #[] for bytecode, 'x for (quote x) (print-gensym (if (and byte-compile-print-gensym (not byte-compile-emacs19-compatibility)) - '(t) nil))) + '(t) nil)) + print-gensym-alist) (princ "\n" byte-compile-outbuffer) (prin1 form byte-compile-outbuffer) nil))) diff -r cacc942c0d0ff698ddad402df54e0fed35425b09 -r b03b5e362fcff61ac4632834ea16615407c1264b lisp/font-lock.el --- a/lisp/font-lock.el Tue Jan 15 21:35:01 2008 +0100 +++ b/lisp/font-lock.el Tue Jan 15 21:35:41 2008 +0100 ＠＠ -959,7 +959,7 ＠＠ see the variables `c-font-lock-extra-typ (let ((was-compiled (eq (car font-lock-keywords) t))) ;; Bring back the user-level (uncompiled) keywords. (if was-compiled - (setq font-lock-keywords (cadr font-lock-keywords))) + (setq font-lock-keywords (cdr font-lock-keywords))) ;; Now modify or replace them. (if (eq how 'set) (setq font-lock-keywords keywords) ＠＠ -1069,7 +1069,7 ＠＠ happens, so the major mode can be correc (let ((was-compiled (eq (car font-lock-keywords) t))) ;; Bring back the user-level (uncompiled) keywords. (if was-compiled - (setq font-lock-keywords (cadr font-lock-keywords))) + (setq font-lock-keywords (cdr font-lock-keywords))) ;; Edit them. (setq font-lock-keywords (copy-sequence font-lock-keywords)) ＠＠ -2031,7 +2031,10 ＠＠ Each keyword has the form (MATCHER HIGHL font-lock-defaults (font-lock-find-font-lock-defaults major-mode))) (keywords (font-lock-choose-keywords - (nth 0 defaults) font-lock-maximum-decoration))) + (nth 0 defaults) font-lock-maximum-decoration)) + (local (cdr (assq major-mode font-lock-keywords-alist))) + (removed-keywords + (cdr-safe (assq major-mode font-lock-removed-keywords-alist)))) ;; Keywords? (setq font-lock-keywords (if (fboundp keywords) ＠＠ -2096,7 +2099,14 ＠＠ Each keyword has the form (MATCHER HIGHL ;; older way: ;; defaults not specified at all, so use `beginning-of-defun'. (setq font-lock-beginning-of-syntax-function - 'beginning-of-defun))))) + 'beginning-of-defun))) + + ;; Local fontification? + (while local + (font-lock-add-keywords nil (car (car local)) (cdr (car local))) + (setq local (cdr local))) + (when removed-keywords + (font-lock-remove-keywords nil removed-keywords)))) (setq font-lock-cache-position (make-marker)) (setq font-lock-defaults-computed t))) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches