Mercurial > emacs
comparison lisp/progmodes/fortran.el @ 110305:b10051866f51
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 11 Sep 2010 01:13:42 +0200 |
| parents | c7809974cd64 |
| children | 14dab55b2888 |
comparison
equal
deleted
inserted
replaced
| 110304:9e6d02d51b19 | 110305:b10051866f51 |
|---|---|
| 481 "sinh" "dsinh" "cosh" "dcosh" "tanh" "dtanh") | 481 "sinh" "dsinh" "cosh" "dcosh" "tanh" "dtanh") |
| 482 'paren) "[ \t]*(") '(1 font-lock-builtin-face)))) | 482 'paren) "[ \t]*(") '(1 font-lock-builtin-face)))) |
| 483 "Maximum highlighting for Fortran mode. | 483 "Maximum highlighting for Fortran mode. |
| 484 Consists of level 3 plus all other intrinsics not already highlighted.") | 484 Consists of level 3 plus all other intrinsics not already highlighted.") |
| 485 | 485 |
| 486 (defvar fortran--font-lock-syntactic-keywords) | |
| 486 ;; Comments are real pain in Fortran because there is no way to | 487 ;; Comments are real pain in Fortran because there is no way to |
| 487 ;; represent the standard comment syntax in an Emacs syntax table. | 488 ;; represent the standard comment syntax in an Emacs syntax table. |
| 488 ;; (We can do so for F90-style). Therefore an unmatched quote in a | 489 ;; (We can do so for F90-style). Therefore an unmatched quote in a |
| 489 ;; standard comment will throw fontification off on the wrong track. | 490 ;; standard comment will throw fontification off on the wrong track. |
| 490 ;; So we do syntactic fontification with regexps. | 491 ;; So we do syntactic fontification with regexps. |
| 885 fortran-font-lock-keywords-1 | 886 fortran-font-lock-keywords-1 |
| 886 fortran-font-lock-keywords-2 | 887 fortran-font-lock-keywords-2 |
| 887 fortran-font-lock-keywords-3 | 888 fortran-font-lock-keywords-3 |
| 888 fortran-font-lock-keywords-4) | 889 fortran-font-lock-keywords-4) |
| 889 nil t ((?/ . "$/") ("_$" . "w")) | 890 nil t ((?/ . "$/") ("_$" . "w")) |
| 890 fortran-beginning-of-subprogram | 891 fortran-beginning-of-subprogram)) |
| 891 (font-lock-syntactic-keywords | 892 (set (make-local-variable 'fortran--font-lock-syntactic-keywords) |
| 892 . fortran-font-lock-syntactic-keywords))) | 893 (fortran-make-syntax-propertize-function)) |
| 894 (set (make-local-variable 'syntax-propertize-function) | |
| 895 (syntax-propertize-via-font-lock fortran--font-lock-syntactic-keywords)) | |
| 893 (set (make-local-variable 'imenu-case-fold-search) t) | 896 (set (make-local-variable 'imenu-case-fold-search) t) |
| 894 (set (make-local-variable 'imenu-generic-expression) | 897 (set (make-local-variable 'imenu-generic-expression) |
| 895 fortran-imenu-generic-expression) | 898 fortran-imenu-generic-expression) |
| 896 (set (make-local-variable 'imenu-syntax-alist) '(("_$" . "w"))) | 899 (set (make-local-variable 'imenu-syntax-alist) '(("_$" . "w"))) |
| 897 (set (make-local-variable 'beginning-of-defun-function) | 900 (set (make-local-variable 'beginning-of-defun-function) |
| 915 (mapc (lambda (buff) | 918 (mapc (lambda (buff) |
| 916 (with-current-buffer buff | 919 (with-current-buffer buff |
| 917 (when (eq major-mode 'fortran-mode) | 920 (when (eq major-mode 'fortran-mode) |
| 918 (setq fortran-line-length nchars | 921 (setq fortran-line-length nchars |
| 919 fill-column fortran-line-length | 922 fill-column fortran-line-length |
| 920 new (fortran-font-lock-syntactic-keywords)) | 923 new (fortran-make-syntax-propertize-function)) |
| 921 ;; Refontify only if necessary. | 924 ;; Refontify only if necessary. |
| 922 (unless (equal new font-lock-syntactic-keywords) | 925 (unless (equal new fortran--font-lock-syntactic-keywords) |
| 923 (setq font-lock-syntactic-keywords new) | 926 (setq fortran--font-lock-syntactic-keywords new) |
| 927 (setq syntax-propertize-function | |
| 928 (syntax-propertize-via-font-lock new)) | |
| 929 (syntax-ppss-flush-cache (point-min)) | |
| 924 (if font-lock-mode (font-lock-mode 1)))))) | 930 (if font-lock-mode (font-lock-mode 1)))))) |
| 925 (if global | 931 (if global |
| 926 (buffer-list) | 932 (buffer-list) |
| 927 (list (current-buffer)))) | 933 (list (current-buffer)))) |
| 928 (if global | 934 (if global |