mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-07 06:50:23 -08:00
minor style issues in lisp/progmodes. * lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init) (vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable -> make-local-hook. * lisp/progmodes/sh-script.el (sh-require-final-newline): Remove. (sh-set-shell): Don't set require-final-newline since it's already done by prog-mode. * lisp/progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column since we never set it. * lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation): Use read-string and standard prompt. * lisp/progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration. * lisp/progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl. (meta-common-mode-syntax-table): Rename from meta-mode-syntax-table. (meta-common-mode-map): Rename from meta-mode-map. Remove C-m binding, which is a user preference, not mode specific. (meta-common-mode): New major mode; replace meta-common-initialization. * lisp/progmodes/js.el (js-mode): Call syntax-propertize rather than messing around with font-lock. * lisp/progmodes/etags.el (select-tags-table-mode): Derive from special-mode. * lisp/progmodes/octave-mod.el (octave-mode): * lisp/progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode) (gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode) (gdb-frames-mode, gdb-locals-mode, gdb-registers-mode): Let define-derived-mode do its job. * lisp/progmodes/cpp.el (cpp-edit-mode-map): Move initialization into declaration. (cpp-edit-mode): Use define-derived-mode. (cpp-edit-load): Use derived-mode-p. * lisp/progmodes/mixal-mode.el (mixal-mode): * lisp/progmodes/f90.el (f90-mode): * lisp/progmodes/cfengine.el (cfengine-mode): Don't bother setting require-final-newline since prog-mode does it already. * lisp/progmodes/cc-cmds.el (c-update-modeline): Use match-string. * lisp/progmodes/asm-mode.el (asm-mode-map): Fix menu setup. * lisp/progmodes/antlr-mode.el: Require cc-mode upfront. (antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in the declaration. (antlr-directory-dependencies, antlr-show-makefile-rules): Use derived-mode-p. (antlr-language-option): Don't assume point-min==1. (antlr-mode): Use define-derived-mode. * lisp/progmodes/ada-mode.el: Use derived-mode-p. (ada-mode): Use define-derived-mode. Use hack-local-variables-hook. * lisp/progmodes/vhdl-mode.el (vhdl-mode): * lisp/progmodes/verilog-mode.el (verilog-mode): * lisp/progmodes/vera-mode.el (vera-mode): * lisp/progmodes/sql.el (sql-mode): * lisp/progmodes/scheme.el (scheme-mode): * lisp/progmodes/perl-mode.el (perl-mode): * lisp/progmodes/octave-inf.el (inferior-octave-mode): * lisp/progmodes/autoconf.el (autoconf-mode): * lisp/progmodes/m4-mode.el (m4-mode): * lisp/progmodes/inf-lisp.el (inferior-lisp-mode): * lisp/progmodes/idlwave.el (idlwave-mode): * lisp/progmodes/icon.el (icon-mode): * lisp/progmodes/idlw-help.el (idlwave-help-mode): * lisp/progmodes/dcl-mode.el (dcl-mode): * lisp/progmodes/idlw-shell.el (idlwave-shell-mode): * lisp/progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode) (ebrowse-member-mode, ebrowse-electric-position-mode): Use define-derived-mode. * lisp/progmodes/xscheme.el (xscheme-start) (local-set-scheme-interaction-buffer, scheme-interaction-mode): * lisp/progmodes/which-func.el (which-function): * lisp/progmodes/vhdl-mode.el (vhdl-set-style): * lisp/progmodes/verilog-mode.el (verilog-set-compile-command) (verilog-modify-compile-command, verilog-error-regexp-add-xemacs) (verilog-set-define, verilog-auto-reeval-locals): * lisp/progmodes/sql.el (sql-product-font-lock, sql-interactive-mode): * lisp/progmodes/simula.el (simula-mode): * lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode): * lisp/progmodes/python.el (python-check, python-mode): * lisp/progmodes/prolog.el (prolog-mode-variables): * lisp/progmodes/gud.el (gud-tooltip-activate-mouse-motions): * lisp/progmodes/ebrowse.el (ebrowse-view-file-other-frame): * lisp/progmodes/delphi.el (delphi-mode): * lisp/progmodes/cc-styles.el (c-setup-paragraph-variables): * lisp/progmodes/cc-mode.el (c-basic-common-init, c-common-init) (c-font-lock-init): Move make-local-variable to their setq. * lisp/progmodes/xscheme.el (exit-scheme-interaction-mode) (xscheme-enter-interaction-mode, xscheme-enter-debugger-mode) (xscheme-debugger-mode-p, xscheme-send-string-1): * lisp/progmodes/tcl.el (inferior-tcl-proc, tcl-current-word) (tcl-load-file, tcl-restart-with-file): * lisp/progmodes/ps-mode.el (ps-run-running): * lisp/progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint): * lisp/progmodes/js.el (js--get-all-known-symbols): * lisp/progmodes/inf-lisp.el (inferior-lisp-proc): * lisp/progmodes/idlwave.el (idlwave-beginning-of-statement) (idlwave-template, idlwave-update-buffer-routine-info) (idlwave-update-current-buffer-info) (idlwave-get-routine-info-from-buffers, idlwave-choose) (idlwave-scan-class-info, idlwave-fix-keywords) (idlwave-list-buffer-load-path-shadows): * lisp/progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add) (idlwave-toolbar-remove): * lisp/progmodes/idlw-shell.el (idlwave-shell-save-and-action) (idlwave-shell-file-name, idlwave-shell-electric-debug-all-off) (idlwave-shell-menu-def): * lisp/progmodes/idlw-complete-structtag.el (idlwave-prepare-structure-tag-completion): * lisp/progmodes/gud.el (gud-set-buffer): * lisp/progmodes/f90.el (f90-backslash-not-special): * lisp/progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.
254 lines
9.5 KiB
EmacsLisp
254 lines
9.5 KiB
EmacsLisp
;;; cfengine.el --- mode for editing Cfengine files
|
|
|
|
;; Copyright (C) 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 support for editing GNU Cfengine files, including
|
|
;; font-locking, Imenu and indention, but with no special keybindings.
|
|
|
|
;; Possible customization for auto-mode selection:
|
|
;; (push '(("^cfagent.conf\\'" . cfengine-mode)) auto-mode-alist)
|
|
;; (push '(("^cf\\." . cfengine-mode)) auto-mode-alist)
|
|
|
|
;; This is not the same as the mode written by Rolf Ebert
|
|
;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5. It does
|
|
;; better fontification and indentation, inter alia.
|
|
|
|
;;; Code:
|
|
|
|
(defgroup cfengine ()
|
|
"Editing Cfengine files."
|
|
:group 'languages)
|
|
|
|
(defcustom cfengine-indent 2
|
|
"*Size of a Cfengine indentation step in columns."
|
|
:group 'cfengine
|
|
:type 'integer)
|
|
|
|
(defcustom cfengine-mode-abbrevs nil
|
|
"Abbrevs for Cfengine mode."
|
|
:group 'cfengine
|
|
:type '(repeat (list (string :tag "Name")
|
|
(string :tag "Expansion")
|
|
(choice :tag "Hook" (const nil) function))))
|
|
|
|
;; Taken from the doc for pre-release 2.1.
|
|
(eval-and-compile
|
|
(defconst cfengine-actions
|
|
'("acl" "alerts" "binservers" "broadcast" "control" "classes" "copy"
|
|
"defaultroute" "disks" "directories" "disable" "editfiles" "files"
|
|
"filters" "groups" "homeservers" "ignore" "import" "interfaces"
|
|
"links" "mailserver" "methods" "miscmounts" "mountables"
|
|
"processes" "packages" "rename" "required" "resolve"
|
|
"shellcommands" "tidy" "unmount"
|
|
;; cfservd
|
|
"admit" "grant" "deny")
|
|
"List of the action keywords supported by Cfengine.
|
|
This includes those for cfservd as well as cfagent."))
|
|
|
|
(defvar cfengine-font-lock-keywords
|
|
`(;; Actions.
|
|
;; List the allowed actions explicitly, so that errors are more obvious.
|
|
(,(concat "^[ \t]*" (eval-when-compile
|
|
(regexp-opt cfengine-actions t))
|
|
":")
|
|
1 font-lock-keyword-face)
|
|
;; Classes.
|
|
("^[ \t]*\\([[:alnum:]_().|!]+\\)::" 1 font-lock-function-name-face)
|
|
;; Variables.
|
|
("$(\\([[:alnum:]_]+\\))" 1 font-lock-variable-name-face)
|
|
("${\\([[:alnum:]_]+\\)}" 1 font-lock-variable-name-face)
|
|
;; Variable definitions.
|
|
("\\<\\([[:alnum:]_]+\\)[ \t]*=[ \t]*(" 1 font-lock-variable-name-face)
|
|
;; File, acl &c in group: { token ... }
|
|
("{[ \t]*\\([^ \t\n]+\\)" 1 font-lock-constant-face)))
|
|
|
|
(defvar cfengine-imenu-expression
|
|
`((nil ,(concat "^[ \t]*" (eval-when-compile
|
|
(regexp-opt cfengine-actions t))
|
|
":[^:]")
|
|
1)
|
|
("Variables/classes" "\\<\\([[:alnum:]_]+\\)[ \t]*=[ \t]*(" 1)
|
|
("Variables/classes" "\\<define=\\([[:alnum:]_]+\\)" 1)
|
|
("Variables/classes" "\\<DefineClass\\>[ \t]+\\([[:alnum:]_]+\\)" 1))
|
|
"`imenu-generic-expression' for Cfengine mode.")
|
|
|
|
(defun cfengine-outline-level ()
|
|
"`outline-level' function for Cfengine mode."
|
|
(if (looking-at "[^:]+\\(?:[:]+\\)$")
|
|
(length (match-string 1))))
|
|
|
|
(defun cfengine-beginning-of-defun ()
|
|
"`beginning-of-defun' function for Cfengine mode.
|
|
Treats actions as defuns."
|
|
(unless (<= (current-column) (current-indentation))
|
|
(end-of-line))
|
|
(if (re-search-backward "^[[:alpha:]]+: *$" nil t)
|
|
(beginning-of-line)
|
|
(goto-char (point-min)))
|
|
t)
|
|
|
|
(defun cfengine-end-of-defun ()
|
|
"`end-of-defun' function for Cfengine mode.
|
|
Treats actions as defuns."
|
|
(end-of-line)
|
|
(if (re-search-forward "^[[:alpha:]]+: *$" nil t)
|
|
(beginning-of-line)
|
|
(goto-char (point-max)))
|
|
t)
|
|
|
|
;; Fixme: Should get an extra indent step in editfiles BeginGroup...s.
|
|
|
|
(defun cfengine-indent-line ()
|
|
"Indent a line in Cfengine mode.
|
|
Intended as the value of `indent-line-function'."
|
|
(let ((pos (- (point-max) (point))))
|
|
(save-restriction
|
|
(narrow-to-defun)
|
|
(back-to-indentation)
|
|
(cond
|
|
;; Action selectors aren't indented; class selectors are
|
|
;; indented one step.
|
|
((looking-at "[[:alnum:]_().|!]+:\\(:\\)?")
|
|
(if (match-string 1)
|
|
(indent-line-to cfengine-indent)
|
|
(indent-line-to 0)))
|
|
;; Outdent leading close brackets one step.
|
|
((or (eq ?\} (char-after))
|
|
(eq ?\) (char-after)))
|
|
(condition-case ()
|
|
(indent-line-to (save-excursion
|
|
(forward-char)
|
|
(backward-sexp)
|
|
(current-column)))
|
|
(error nil)))
|
|
;; Inside brackets/parens: indent to start column of non-comment
|
|
;; token on line following open bracket or by one step from open
|
|
;; bracket's column.
|
|
((condition-case ()
|
|
(progn (indent-line-to (save-excursion
|
|
(backward-up-list)
|
|
(forward-char)
|
|
(skip-chars-forward " \t")
|
|
(if (looking-at "[^\n#]")
|
|
(current-column)
|
|
(skip-chars-backward " \t")
|
|
(+ (current-column) -1
|
|
cfengine-indent))))
|
|
t)
|
|
(error nil)))
|
|
;; Indent by two steps after a class selector.
|
|
((save-excursion
|
|
(re-search-backward "^[ \t]*[[:alnum:]_().|!]+::" nil t))
|
|
(indent-line-to (* 2 cfengine-indent)))
|
|
;; Indent by one step if we're after an action header.
|
|
((save-excursion
|
|
(goto-char (point-min))
|
|
(looking-at "[[:alpha:]]+:[ \t]*$"))
|
|
(indent-line-to cfengine-indent))
|
|
;; Else don't indent.
|
|
(t
|
|
(indent-line-to 0))))
|
|
;; If initial point was within line's indentation,
|
|
;; position after the indentation. Else stay at same point in text.
|
|
(if (> (- (point-max) pos) (point))
|
|
(goto-char (- (point-max) pos)))))
|
|
|
|
;; This doesn't work too well in Emacs 21.2. See 22.1 development
|
|
;; code.
|
|
(defun cfengine-fill-paragraph (&optional justify)
|
|
"Fill `paragraphs' in Cfengine code."
|
|
(interactive "P")
|
|
(or (if (fboundp 'fill-comment-paragraph)
|
|
(fill-comment-paragraph justify) ; post Emacs 21.3
|
|
;; else do nothing in a comment
|
|
(nth 4 (parse-partial-sexp (save-excursion
|
|
(beginning-of-defun)
|
|
(point))
|
|
(point))))
|
|
(let ((paragraph-start
|
|
;; Include start of parenthesized block.
|
|
"\f\\|[ \t]*$\\|.*\(")
|
|
(paragraph-separate
|
|
;; Include action and class lines, start and end of
|
|
;; bracketed blocks and end of parenthesized blocks to
|
|
;; avoid including these in fill. This isn't ideal.
|
|
"[ \t\f]*$\\|.*#\\|.*[\){}]\\|\\s-*[[:alpha:]_().|!]+:")
|
|
fill-paragraph-function)
|
|
(fill-paragraph justify))
|
|
t))
|
|
|
|
;;;###autoload
|
|
(define-derived-mode cfengine-mode fundamental-mode "Cfengine"
|
|
"Major mode for editing cfengine input.
|
|
There are no special keybindings by default.
|
|
|
|
Action blocks are treated as defuns, i.e. \\[beginning-of-defun] moves
|
|
to the action header."
|
|
(modify-syntax-entry ?# "<" cfengine-mode-syntax-table)
|
|
(modify-syntax-entry ?\n ">#" cfengine-mode-syntax-table)
|
|
;; Shell commands can be quoted by single, double or back quotes.
|
|
;; It's debatable whether we should define string syntax, but it
|
|
;; should avoid potential confusion in some cases.
|
|
(modify-syntax-entry ?\" "\"" cfengine-mode-syntax-table)
|
|
(modify-syntax-entry ?\' "\"" cfengine-mode-syntax-table)
|
|
(modify-syntax-entry ?\` "\"" cfengine-mode-syntax-table)
|
|
;; variable substitution:
|
|
(modify-syntax-entry ?$ "." cfengine-mode-syntax-table)
|
|
;; Doze path separators:
|
|
(modify-syntax-entry ?\\ "." cfengine-mode-syntax-table)
|
|
;; Otherwise, syntax defaults seem OK to give reasonable word
|
|
;; movement.
|
|
|
|
(set (make-local-variable 'parens-require-spaces) nil)
|
|
(set (make-local-variable 'comment-start) "# ")
|
|
(set (make-local-variable 'comment-start-skip)
|
|
"\\(\\(?:^\\|[^\\\\\n]\\)\\(?:\\\\\\\\\\)*\\)#+[ \t]*")
|
|
(set (make-local-variable 'indent-line-function) #'cfengine-indent-line)
|
|
(set (make-local-variable 'outline-regexp) "[ \t]*\\(\\sw\\|\\s_\\)+:+")
|
|
(set (make-local-variable 'outline-level) #'cfengine-outline-level)
|
|
(set (make-local-variable 'fill-paragraph-function)
|
|
#'cfengine-fill-paragraph)
|
|
(define-abbrev-table 'cfengine-mode-abbrev-table cfengine-mode-abbrevs)
|
|
(setq font-lock-defaults
|
|
'(cfengine-font-lock-keywords nil nil nil beginning-of-line))
|
|
;; Fixme: set the args of functions in evaluated classes to string
|
|
;; syntax, and then obey syntax properties.
|
|
(set (make-local-variable 'syntax-propertize-function)
|
|
;; In the main syntax-table, \ is marked as a punctuation, because
|
|
;; of its use in DOS-style directory separators. Here we try to
|
|
;; recognize the cases where \ is used as an escape inside strings.
|
|
(syntax-propertize-rules ("\\(\\(?:\\\\\\)+\\)\"" (1 "\\"))))
|
|
(setq imenu-generic-expression cfengine-imenu-expression)
|
|
(set (make-local-variable 'beginning-of-defun-function)
|
|
#'cfengine-beginning-of-defun)
|
|
(set (make-local-variable 'end-of-defun-function) #'cfengine-end-of-defun)
|
|
;; Like Lisp mode. Without this, we lose with, say,
|
|
;; `backward-up-list' when there's an unbalanced quote in a
|
|
;; preceding comment.
|
|
(set (make-local-variable 'parse-sexp-ignore-comments) t))
|
|
|
|
(provide 'cfengine)
|
|
|
|
;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
|
|
;;; cfengine.el ends here
|