Mercurial > emacs
view lisp/ledit.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 | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; ledit.el --- Emacs side of ledit interface ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; This is a major mode for editing Liszt. See etc/LEDIT for details. ;;; Code: ;;; To do: ;;; o lisp -> emacs side of things (grind-definition and find-definition) (defvar ledit-mode-map nil) (defconst ledit-zap-file (expand-file-name (concat (user-login-name) ".l1") temporary-file-directory) "File name for data sent to Lisp by Ledit.") (defconst ledit-read-file (expand-file-name (concat (user-login-name) ".l2") temporary-file-directory) "File name for data sent to Ledit by Lisp.") (defconst ledit-compile-file (expand-file-name (concat (user-login-name) ".l4") temporary-file-directory) "File name for data sent to Lisp compiler by Ledit.") (defconst ledit-buffer "*LEDIT*" "Name of buffer in which Ledit accumulates data to send to Lisp.") ;;;###autoload (defconst ledit-save-files t "\ *Non-nil means Ledit should save files before transferring to Lisp.") ;;;###autoload (defconst ledit-go-to-lisp-string "%?lisp" "\ *Shell commands to execute to resume Lisp job.") ;;;###autoload (defconst ledit-go-to-liszt-string "%?liszt" "\ *Shell commands to execute to resume Lisp compiler job.") (defun ledit-save-defun () "Save the current defun in the ledit buffer." (interactive) (save-excursion (end-of-defun) (let ((end (point))) (beginning-of-defun) (append-to-buffer ledit-buffer (point) end)) (message "Current defun saved for Lisp"))) (defun ledit-save-region (beg end) "Save the current region in the ledit buffer" (interactive "r") (append-to-buffer ledit-buffer beg end) (message "Region saved for Lisp")) (defun ledit-zap-defun-to-lisp () "Carry the current defun to Lisp." (interactive) (ledit-save-defun) (ledit-go-to-lisp)) (defun ledit-zap-defun-to-liszt () "Carry the current defun to liszt." (interactive) (ledit-save-defun) (ledit-go-to-liszt)) (defun ledit-zap-region-to-lisp (beg end) "Carry the current region to Lisp." (interactive "r") (ledit-save-region beg end) (ledit-go-to-lisp)) (defun ledit-go-to-lisp () "Suspend Emacs and restart a waiting Lisp job." (interactive) (if ledit-save-files (save-some-buffers)) (if (get-buffer ledit-buffer) (with-current-buffer ledit-buffer (goto-char (point-min)) (write-region (point-min) (point-max) ledit-zap-file) (erase-buffer))) (suspend-emacs ledit-go-to-lisp-string) (load ledit-read-file t t)) (defun ledit-go-to-liszt () "Suspend Emacs and restart a waiting Liszt job." (interactive) (if ledit-save-files (save-some-buffers)) (if (get-buffer ledit-buffer) (with-current-buffer ledit-buffer (goto-char (point-min)) (insert "(declare (macros t))\n") (write-region (point-min) (point-max) ledit-compile-file) (erase-buffer))) (suspend-emacs ledit-go-to-liszt-string) (load ledit-read-file t t)) (defun ledit-setup () "Set up key bindings for the Lisp/Emacs interface." (unless ledit-mode-map (setq ledit-mode-map (make-sparse-keymap)) (set-keymap-parent ledit-mode-map lisp-mode-shared-map)) (define-key ledit-mode-map "\e\^d" 'ledit-save-defun) (define-key ledit-mode-map "\e\^r" 'ledit-save-region) (define-key ledit-mode-map "\^xz" 'ledit-go-to-lisp) (define-key ledit-mode-map "\e\^c" 'ledit-go-to-liszt)) (ledit-setup) ;;;###autoload (defun ledit-mode () "\\<ledit-mode-map>Major mode for editing text and stuffing it to a Lisp job. Like Lisp mode, plus these special commands: \\[ledit-save-defun] -- record defun at or after point for later transmission to Lisp job. \\[ledit-save-region] -- record region for later transmission to Lisp job. \\[ledit-go-to-lisp] -- transfer to Lisp job and transmit saved text. \\[ledit-go-to-liszt] -- transfer to Liszt (Lisp compiler) job and transmit saved text. \\{ledit-mode-map} To make Lisp mode automatically change to Ledit mode, do (setq lisp-mode-hook 'ledit-from-lisp-mode)" (interactive) (delay-mode-hooks (lisp-mode)) (ledit-from-lisp-mode)) ;;;###autoload (defun ledit-from-lisp-mode () (use-local-map ledit-mode-map) (setq mode-name "Ledit") (setq major-mode 'ledit-mode) (run-mode-hooks 'ledit-mode-hook)) (provide 'ledit) ;; arch-tag: f0f1ca13-8d31-478c-ae1b-b448c55a8faf ;;; ledit.el ends here