Mercurial > emacs
view etc/images/lock-broken.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_broken_xpm[] = { "24 24 204 2", " c None", ". c #0E0E0E", "+ c #262626", "@ c #464646", "# c #3C3C3C", "$ c #3B3B3B", "% c #212121", "& c #252525", "* c #ADADAD", "= c #F0F0F0", "- c #EAEAEA", "; c #1A1A1A", "> c #000000", ", c #FAFAFA", "' c #F4F4F4", ") c #4D4D4D", "! c #303030", "~ c #D8D8D8", "{ c #E5E5E5", "] c #B0B0B0", "^ c #414141", "/ c #484848", "( c #030303", "_ c #DADADA", ": c #E4E4E4", "< c #353535", "[ c #070707", "} c #A6A6A6", "| c #E6E6E6", "1 c #686868", "2 c #020202", "3 c #3E3E3E", "4 c #EFEFEF", "5 c #9B9B9B", "6 c #343434", "7 c #F8F8F8", "8 c #999999", "9 c #F1F1F1", "0 c #C4C4C4", "a c #232323", "b c #535353", "c c #AEAEAE", "d c #F3F3F3", "e c #D3D3D3", "f c #242424", "g c #4E4E4E", "h c #EEEEEE", "i c #B5B5B5", "j c #0F0601", "k c #200E03", "l c #765E49", "m c #7D6A56", "n c #38291D", "o c #180A03", "p c #D6CBC1", "q c #A09E9D", "r c #1D1109", "s c #2A1E13", "t c #3D2E21", "u c #3F3123", "v c #47423D", "w c #DBB98E", "x c #D6B183", "y c #D3AC7E", "z c #CFA573", "A c #CD9E67", "B c #C39056", "C c #46270A", "D c #281F14", "E c #675643", "F c #A48367", "G c #D8AB7C", "H c #BF9E7C", "I c #DCBB93", "J c #DCB786", "K c #D1A872", "L c #231B12", "M c #7B6C58", "N c #C69B63", "O c #C39860", "P c #C09257", "Q c #BD8A4A", "R c #B9803D", "S c #AA6E28", "T c #412409", "U c #100B07", "V c #CDB598", "W c #E8CCA9", "X c #DAB587", "Y c #D4AC7D", "Z c #D1A775", "` c #C99F6A", " . c #AF8B5B", ".. c #2E2517", "+. c #1E1910", "@. c #0B0805", "#. c #594B39", "$. c #2A2015", "%. c #C2975E", "&. c #BE8D50", "*. c #BB823F", "=. c #AE722C", "-. c #422409", ";. c #0E0B07", ">. c #AB957E", ",. c #E9CEAC", "'. c #DBB68A", "). c #D5AD7E", "!. c #D0A975", "~. c #C9A26F", "{. c #B99667", "]. c #AA895F", "^. c #31291C", "/. c #322A1C", "(. c #54493B", "_. c #C69C64", ":. c #C2965E", "<. c #BE8E50", "[. c #C29156", "}. c #9E692A", "|. c #1A150D", "1. c #887762", "2. c #EAD1AF", "3. c #DDB98E", "4. c #D4AC7E", "5. c #D2A876", "6. c #C39E6D", "7. c #927751", "8. c #15110C", "9. c #988468", "0. c #C2945A", "a. c #BE8F51", "b. c #BC8544", "c. c #BE8A4F", "d. c #9A6526", "e. c #70604D", "f. c #EFD6B5", "g. c #DEBD93", "h. c #D4AC7C", "i. c #D0A672", "j. c #C9A069", "k. c #9D7E53", "l. c #140F09", "m. c #1F1710", "n. c #EFD8B9", "o. c #E3C39C", "p. c #D7B080", "q. c #D4AC79", "r. c #CDA46F", "s. c #3A2C1B", "t. c #FFFFFF", "u. c #1C160D", "v. c #B29E85", "w. c #E6C8A3", "x. c #D7B081", "y. c #D1A874", "z. c #CBA16A", "A. c #BA905A", "B. c #251C10", "C. c #DF421E", "D. c #F7F7F7", "E. c #DFDFDF", "F. c #2F2619", "G. c #92806A", "H. c #E6C7A2", "I. c #D6AF7E", "J. c #CCA26C", "K. c #53422A", "L. c #211910", "M. c #2A2014", "N. c #E1E1E1", "O. c #6A5C4A", "P. c #EAD0AD", "Q. c #DAB68B", "R. c #D2A978", "S. c #CEA56E", "T. c #C89D66", "U. c #856740", "V. c #534026", "W. c #F9F9F9", "X. c #FBFBFB", "Y. c #E2E2E2", "Z. c #42362B", "`. c #D1BA9B", " + c #DCBA8E", ".+ c #D1A773", "++ c #C4975C", "@+ c #BE8C4C", "#+ c #B4813F", "$+ c #281B0B", "%+ c #E3E3E3", "&+ c #372416", "*+ c #74654F", "=+ c #B68E5C", "-+ c #926231", ";+ c #452B11", ">+ c #341E09", ",+ c #221205", "'+ c #150802", ")+ c #FDFDFD", "!+ c #030000", "~+ c #050000", "{+ c #010000", "]+ c #C3C3C3", " ", " ", " . + @ # $ % ", " & * = - ; > , ' ) > ", " ! ~ { ] ^ / ( $ _ : < ", " [ } | 1 2 3 4 5 > ", " 6 7 8 > > 9 0 a ", " b 9 c > > d e f ", " g h i > j k l m n o ", " ^ p q r s t u > v w x y z A B C ", " D E F G H I J K L > M N O P Q R S T ", " U V W X Y Z ` ...+. @.#.$.%.&.*.=.-. ", " ;.>.,.'.).!.~.{.].^./. (._.:.<.[.}.-. ", " |.1.2.3.4.5.6.7.8. > 9.0.a.b.c.d.T ", " e.f.g.h.i.j.k.l.> > > > > > > > > > ", " m.n.o.p.q.r._.s. > t.t.t.t.t.t.t.> ", " u.v.w.x.y.z.A.B.> > t.C.C.D.C.C.E.> ", " F.G.H.I.i.J.K.L.M. > t.C.C.C.C.C.N.> ", " O.P.Q.R.S.T.U.V. > t.W.C.C.C.X.Y.> ", " Z.`. +.+z.++@+#+$+> > t.C.C.C.C.C.%+> ", " &+*+=+-+;+>+,+'+ > t.C.C.)+C.C.{ > ", " !+~+{+> > - %+%+: { { ]+> ", " > > > > > > > > > ", " "};