Mercurial > emacs
view etc/images/lock.xpm @ 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 | ed7704221f2b |
children |
line wrap: on
line source
/* XPM */ static char * stock_lock_xpm[] = { "24 24 200 2", " c None", ". c #000000", "+ c #212121", "@ c #9E9E9E", "# c #E6E6E6", "$ c #E7E7E7", "% c #C8C8C8", "& c #A0A0A0", "* c #131313", "= c #5F5F5F", "- c #EDEDED", "; c #D6D6D6", "> c #D5D5D5", ", c #DDDDDD", "' c #D8D8D8", ") c #A1A1A1", "! c #3C3C3C", "~ c #353535", "{ c #EFEFEF", "] c #CFCFCF", "^ c #4C4C4C", "/ c #141414", "( c #6A6A6A", "_ c #D0D0D0", ": c #B2B2B2", "< c #454545", "[ c #E2E2E2", "} c #292929", "| c #0F0F0F", "1 c #949494", "2 c #E9E9E9", "3 c #C3C3C3", "4 c #1C1C1C", "5 c #E1E1E1", "6 c #272727", "7 c #DEDEDE", "8 c #B6B6B6", "9 c #B7B6B6", "0 c #150902", "a c #2E2419", "b c #251D15", "c c #616160", "d c #5E5A56", "e c #29211A", "f c #15100C", "g c #2F251B", "h c #1D1710", "i c #4A392B", "j c #656361", "k c #565352", "l c #392B1D", "m c #322110", "n c #0C0500", "o c #EFDBBF", "p c #EDD9C0", "q c #E9D5BE", "r c #E7D2B9", "s c #E5D0B3", "t c #DCC09D", "u c #D9BE99", "v c #DABE99", "w c #D7BB95", "x c #D5B68E", "y c #D2AF85", "z c #CFA77C", "A c #9A5E1B", "B c #F0DABF", "C c #E4C6A0", "D c #D6AF80", "E c #D3AC7B", "F c #D0A570", "G c #C99F68", "H c #C69B64", "I c #C69C64", "J c #C89D66", "K c #C79C65", "L c #C39860", "M c #C09256", "N c #BC8645", "O c #B67C36", "P c #985E1A", "Q c #EED8BC", "R c #E3C39C", "S c #D3AA7B", "T c #CFA670", "U c #CA9F68", "V c #C89E66", "W c #C89F68", "X c #C49961", "Y c #C09358", "Z c #BC8746", "` c #B77D39", " . c #EED8BB", ".. c #E2C29B", "+. c #D6AE7F", "@. c #CA9E6D", "#. c #C69861", "$. c #BF925A", "%. c #BB8E56", "&. c #BD8E56", "*. c #BD9058", "=. c #BC8F58", "-. c #B9884E", ";. c #B48145", ">. c #BA8442", ",. c #B47834", "'. c #975C1A", "). c #EFDABE", "!. c #E4C49D", "~. c #D7B080", "{. c #DAB685", "]. c #D4B07C", "^. c #D0A971", "/. c #CEA46B", "(. c #CDA46D", "_. c #CCA66D", ":. c #CCA46B", "<. c #CA9F63", "[. c #C79858", "}. c #B9813F", "|. c #B37834", "1. c #975D1A", "2. c #EFD8BB", "3. c #E0C199", "4. c #D3AA7A", "5. c #C89B67", "6. c #C3965F", "7. c #BC8E56", "8. c #BA8B52", "9. c #BA8C54", "0. c #BB8D55", "a. c #BA8C55", "b. c #B6864C", "c. c #B47F43", "d. c #BA833F", "e. c #B37934", "f. c #9B601E", "g. c #E3C29C", "h. c #D9B484", "i. c #D4AE77", "j. c #CFA770", "k. c #CBA36B", "l. c #CCA46C", "m. c #CA9D61", "n. c #C69856", "o. c #BA813E", "p. c #B27733", "q. c #A36B2F", "r. c #EDD6B8", "s. c #E1BD94", "t. c #D1A874", "u. c #B7874E", "v. c #B48349", "w. c #B5844C", "x. c #B5884D", "y. c #B48146", "z. c #B27A3C", "A. c #B67D3A", "B. c #B07530", "C. c #A67137", "D. c #EED8BA", "E. c #E0C099", "F. c #D8B37F", "G. c #D2AD76", "H. c #CEA66F", "I. c #CCA46D", "J. c #CCA56D", "K. c #C99D61", "L. c #C69858", "M. c #B9803D", "N. c #B67D38", "O. c #AB783F", "P. c #EED5B7", "Q. c #DFC096", "R. c #D2A776", "S. c #CEA46E", "T. c #C89D65", "U. c #C49960", "V. c #C1955C", "W. c #C2955C", "X. c #C2965C", "Y. c #C09155", "Z. c #BC8A4B", "`. c #BE8A4C", " + c #A9773C", ".+ c #AC8C65", "++ c #CFA772", "@+ c #C49256", "#+ c #C08D51", "$+ c #BA8849", "%+ c #B78342", "&+ c #B48240", "*+ c #B68241", "=+ c #B88544", "-+ c #BB8949", ";+ c #BC8748", ">+ c #BA874A", ",+ c #B98548", "'+ c #B27B3B", ")+ c #6D4215", " ", " ", " . . . . . ", " . + @ # $ % & * ", " . = - # ; > , ' ) ! . ", " ~ { ] ^ . . / ( _ : < ", " . [ ' } . | ( % 1 . ", " * 2 3 . 4 5 @ . ", " 6 7 8 . . $ 9 . ", " 0 a b c d e f g b h b i j k l m n ", " . o p q r s t u u v u w x y z A . ", " . B C D E F G H I J K L M N O P . ", " . Q R D S T U I V W V X Y Z ` A . ", " . ...+.@.#.$.%.&.*.=.-.;.>.,.'.. ", " . ).!.~.{.].^./.(._.:.<.[.}.|.1.. ", " . 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.. ", " . Q g.+.h.i.j.:.k.l.k.m.n.o.p.q.. ", " . r.s.t.#.*.u.v.w.x.b.y.z.A.B.C.. ", " . D.E.S F.G.H.:.I.J.l.K.L.M.N.O.. ", " . P.Q.R.S.T.U.V.W.X.X.Y.Z.>.`. +. ", " . .+++@+#+$+%+&+*+=+-+;+>+,+'+)+. ", " . . . . . . . . . . . . . . . ", " ", " "};