mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-18 11:50:38 -08:00
cf38dd4298
* 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.
110 lines
4 KiB
EmacsLisp
110 lines
4 KiB
EmacsLisp
;;; autoconf.el --- mode for editing Autoconf configure.in files
|
|
|
|
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
|
;; Free Software Foundation, Inc.
|
|
|
|
;; Author: Dave Love <fx@gnu.org>
|
|
;; 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:
|
|
|
|
;; Provides fairly minimal font-lock, imenu and indentation support
|
|
;; for editing configure.in files. Only Autoconf syntax is processed.
|
|
;; There is no attempt to deal with shell text -- probably that will
|
|
;; always lose.
|
|
|
|
;; This is specialized for configure.in files. It doesn't inherit the
|
|
;; general M4 stuff from M4 mode.
|
|
|
|
;; There is also an autoconf-mode.el in existence. That appears to be
|
|
;; for editing the Autoconf M4 source, rather than configure.in files.
|
|
|
|
;;; Code:
|
|
|
|
(defvar font-lock-syntactic-keywords)
|
|
|
|
(defvar autoconf-mode-map (make-sparse-keymap))
|
|
|
|
(defvar autoconf-mode-hook nil
|
|
"Hook run by `autoconf-mode'.")
|
|
|
|
(defconst autoconf-definition-regexp
|
|
"AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\[*\\(\\sw+\\)\\]*")
|
|
|
|
(defvar autoconf-font-lock-keywords
|
|
`(("\\_<A[CHMS]_\\sw+" . font-lock-keyword-face)
|
|
(,autoconf-definition-regexp
|
|
3 font-lock-function-name-face)
|
|
;; Are any other M4 keywords really appropriate for configure.in,
|
|
;; given that we do `dnl'?
|
|
("changequote" . font-lock-keyword-face)))
|
|
|
|
(defvar autoconf-mode-syntax-table
|
|
(let ((table (make-syntax-table)))
|
|
(modify-syntax-entry ?\" "." table)
|
|
(modify-syntax-entry ?\n ">" table)
|
|
(modify-syntax-entry ?# "<" table)
|
|
table))
|
|
|
|
(defvar autoconf-imenu-generic-expression
|
|
(list (list nil autoconf-definition-regexp 3)))
|
|
|
|
;; It's not clear how best to implement this.
|
|
(defun autoconf-current-defun-function ()
|
|
"Function to use for `add-log-current-defun-function' in Autoconf mode.
|
|
This version looks back for an AC_DEFINE or AC_SUBST. It will stop
|
|
searching backwards at another AC_... command."
|
|
(save-excursion
|
|
(with-syntax-table (copy-syntax-table autoconf-mode-syntax-table)
|
|
(modify-syntax-entry ?_ "w")
|
|
(if (re-search-backward autoconf-definition-regexp
|
|
(save-excursion (beginning-of-defun) (point))
|
|
t)
|
|
(match-string-no-properties 3)))))
|
|
|
|
;;;###autoload
|
|
(defun autoconf-mode ()
|
|
"Major mode for editing Autoconf configure.in files."
|
|
(interactive)
|
|
(kill-all-local-variables)
|
|
(use-local-map autoconf-mode-map)
|
|
(setq major-mode 'autoconf-mode)
|
|
(setq mode-name "Autoconf")
|
|
(set-syntax-table autoconf-mode-syntax-table)
|
|
(set (make-local-variable 'parens-require-spaces) nil) ; for M4 arg lists
|
|
(set (make-local-variable 'defun-prompt-regexp)
|
|
"^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+")
|
|
(set (make-local-variable 'comment-start) "dnl ")
|
|
(set (make-local-variable 'comment-start-skip) "\\(?:\\<dnl\\|#\\) +")
|
|
(set (make-local-variable 'syntax-propertize-function)
|
|
(syntax-propertize-rules ("\\<dnl\\>" (0 "<"))))
|
|
(set (make-local-variable 'font-lock-defaults)
|
|
`(autoconf-font-lock-keywords nil nil (("_" . "w"))))
|
|
(set (make-local-variable 'imenu-generic-expression)
|
|
autoconf-imenu-generic-expression)
|
|
(set (make-local-variable 'imenu-syntax-alist) '(("_" . "w")))
|
|
(set (make-local-variable 'indent-line-function) #'indent-relative)
|
|
(set (make-local-variable 'add-log-current-defun-function)
|
|
#'autoconf-current-defun-function)
|
|
(run-mode-hooks 'autoconf-mode-hook))
|
|
|
|
(provide 'autoconf-mode)
|
|
(provide 'autoconf)
|
|
|
|
;; arch-tag: 4f44778f-2ab3-49a1-a103-f0acb9df2de4
|
|
;;; autoconf.el ends here
|