Mercurial > emacs
comparison lisp/progmodes/gud.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 | ff640a48b313 |
| children | 77c2be84591c |
comparison
equal
deleted
inserted
replaced
| 110304:9e6d02d51b19 | 110305:b10051866f51 |
|---|---|
| 3121 (defvar gdb-script-font-lock-keywords | 3121 (defvar gdb-script-font-lock-keywords |
| 3122 '(("^define\\s-+\\(\\(\\w\\|\\s_\\)+\\)" (1 font-lock-function-name-face)) | 3122 '(("^define\\s-+\\(\\(\\w\\|\\s_\\)+\\)" (1 font-lock-function-name-face)) |
| 3123 ("\\$\\(\\w+\\)" (1 font-lock-variable-name-face)) | 3123 ("\\$\\(\\w+\\)" (1 font-lock-variable-name-face)) |
| 3124 ("^\\s-*\\(\\w\\(\\w\\|\\s_\\)*\\)" (1 font-lock-keyword-face)))) | 3124 ("^\\s-*\\(\\w\\(\\w\\|\\s_\\)*\\)" (1 font-lock-keyword-face)))) |
| 3125 | 3125 |
| 3126 (defvar gdb-script-font-lock-syntactic-keywords | 3126 (defconst gdb-script-syntax-propertize-function |
| 3127 '(("^document\\s-.*\\(\n\\)" (1 "< b")) | 3127 (syntax-propertize-rules |
| 3128 ("^end\\>" | 3128 ("^document\\s-.*\\(\n\\)" (1 "< b")) |
| 3129 (0 (unless (eq (match-beginning 0) (point-min)) | 3129 ("^end\\(\\>\\)" |
| 3130 (1 (ignore | |
| 3131 (unless (eq (match-beginning 0) (point-min)) | |
| 3130 ;; We change the \n in front, which is more difficult, but results | 3132 ;; We change the \n in front, which is more difficult, but results |
| 3131 ;; in better highlighting. If the doc is empty, the single \n is | 3133 ;; in better highlighting. If the doc is empty, the single \n is |
| 3132 ;; both the beginning and the end of the docstring, which can't be | 3134 ;; both the beginning and the end of the docstring, which can't be |
| 3133 ;; expressed in syntax-tables. Instead, we place the "> b" after | 3135 ;; expressed in syntax-tables. Instead, we place the "> b" after |
| 3134 ;; placing the "< b", so the start marker is overwritten by the | 3136 ;; placing the "< b", so the start marker is overwritten by the |
| 3136 ;; there's no docstring at all, which is fine. | 3138 ;; there's no docstring at all, which is fine. |
| 3137 (put-text-property (1- (match-beginning 0)) (match-beginning 0) | 3139 (put-text-property (1- (match-beginning 0)) (match-beginning 0) |
| 3138 'syntax-table (eval-when-compile | 3140 'syntax-table (eval-when-compile |
| 3139 (string-to-syntax "> b"))) | 3141 (string-to-syntax "> b"))) |
| 3140 ;; Make sure that rehighlighting the previous line won't erase our | 3142 ;; Make sure that rehighlighting the previous line won't erase our |
| 3141 ;; syntax-table property. | 3143 ;; syntax-table property and that modifying `end' will. |
| 3142 (put-text-property (1- (match-beginning 0)) (match-end 0) | 3144 (put-text-property (1- (match-beginning 0)) (match-end 0) |
| 3143 'font-lock-multiline t) | 3145 'syntax-multiline t))))))) |
| 3144 nil))))) | |
| 3145 | 3146 |
| 3146 (defun gdb-script-font-lock-syntactic-face (state) | 3147 (defun gdb-script-font-lock-syntactic-face (state) |
| 3147 (cond | 3148 (cond |
| 3148 ((nth 3 state) font-lock-string-face) | 3149 ((nth 3 state) font-lock-string-face) |
| 3149 ((nth 7 state) font-lock-doc-face) | 3150 ((nth 7 state) font-lock-doc-face) |
| 3237 #'gdb-script-beginning-of-defun) | 3238 #'gdb-script-beginning-of-defun) |
| 3238 (set (make-local-variable 'end-of-defun-function) | 3239 (set (make-local-variable 'end-of-defun-function) |
| 3239 #'gdb-script-end-of-defun) | 3240 #'gdb-script-end-of-defun) |
| 3240 (set (make-local-variable 'font-lock-defaults) | 3241 (set (make-local-variable 'font-lock-defaults) |
| 3241 '(gdb-script-font-lock-keywords nil nil ((?_ . "w")) nil | 3242 '(gdb-script-font-lock-keywords nil nil ((?_ . "w")) nil |
| 3242 (font-lock-syntactic-keywords | |
| 3243 . gdb-script-font-lock-syntactic-keywords) | |
| 3244 (font-lock-syntactic-face-function | 3243 (font-lock-syntactic-face-function |
| 3245 . gdb-script-font-lock-syntactic-face)))) | 3244 . gdb-script-font-lock-syntactic-face))) |
| 3245 ;; Recognize docstrings. | |
| 3246 (set (make-local-variable 'syntax-propertize-function) | |
| 3247 gdb-script-syntax-propertize-function) | |
| 3248 (add-hook 'syntax-propertize-extend-region-functions | |
| 3249 #'syntax-propertize-multiline 'append 'local)) | |
| 3246 | 3250 |
| 3247 | 3251 |
| 3248 ;;; tooltips for GUD | 3252 ;;; tooltips for GUD |
| 3249 | 3253 |
| 3250 ;;; Customizable settings | 3254 ;;; Customizable settings |