X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/09d9db2c4921cb2eb0974892164dd03d6bffdd80..54c57cc6c7d1f77933ccaed32284aabecfa4a7c8:/lisp/progmodes/vera-mode.el diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el index f2842721f2..7b59faca26 100644 --- a/lisp/progmodes/vera-mode.el +++ b/lisp/progmodes/vera-mode.el @@ -1,6 +1,6 @@ -;;; vera-mode.el --- major mode for editing Vera files. +;;; vera-mode.el --- major mode for editing Vera files -;; Copyright (C) 1997-2011 Free Software Foundation, Inc. +;; Copyright (C) 1997-2013 Free Software Foundation, Inc. ;; Author: Reto Zimmermann ;; Maintainer: Reto Zimmermann @@ -90,12 +90,12 @@ :group 'languages) (defcustom vera-basic-offset 2 - "*Amount of basic offset used for indentation." + "Amount of basic offset used for indentation." :type 'integer :group 'vera) (defcustom vera-underscore-is-part-of-word nil - "*Non-nil means consider the underscore character `_' as part of word. + "Non-nil means consider the underscore character `_' as part of word. An identifier containing underscores is then treated as a single word in select and move operations. All parts of an identifier separated by underscore are treated as single words otherwise." @@ -103,7 +103,7 @@ are treated as single words otherwise." :group 'vera) (defcustom vera-intelligent-tab t - "*Non-nil means `TAB' does indentation, word completion and tab insertion. + "Non-nil means `TAB' does indentation, word completion and tab insertion. That is, if preceding character is part of a word then complete word, else if not at beginning of line then insert tab, else if last command was a `TAB' or `RET' then dedent one step, @@ -310,7 +310,6 @@ Key bindings: (set (make-local-variable 'comment-indent-function) 'c-comment-indent) (set (make-local-variable 'paragraph-start) "^$") (set (make-local-variable 'paragraph-separate) paragraph-start) - (set (make-local-variable 'require-final-newline) t) (set (make-local-variable 'indent-tabs-mode) nil) (set (make-local-variable 'indent-line-function) 'vera-indent-line) (set (make-local-variable 'parse-sexp-ignore-comments) t) @@ -428,7 +427,7 @@ Key bindings: "icompare" "insert" "inst_get_at_least" "inst_get_auto_bin_max" "inst_get_collect" "inst_get_cov_weight" "inst_get_coverage_goal" "inst_getcross_bin_max" "inst_query" "inst_set_at_least" - "inst_set_auto_bin_max" "inst_set_bin_activiation" "inst_set_collect" + "inst_set_auto_bin_max" "inst_set_bin_activation" "inst_set_collect" "inst_set_cov_weight" "inst_set_coverage_goal" "inst_set_cross_bin_max" "itoa" "last" "last_index" "len" "load" @@ -439,7 +438,7 @@ Key bindings: "push_front" "putc" "query" "query_str" "rand_mode" "randomize" "reserve" "reverse" "rsort" - "search" "set_at_least" "set_auto_bin_max" "set_bin_activiation" + "search" "set_at_least" "set_auto_bin_max" "set_bin_activation" "set_cov_weight" "set_coverage_goal" "set_cross_bin_max" "set_name" "size" "sort" "substr" "sum" "thismatch" "tolower" "toupper" @@ -588,12 +587,6 @@ Key bindings: ;;; Font locking ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; XEmacs compatibility -(when (featurep 'xemacs) - (require 'font-lock) - (copy-face 'font-lock-reference-face 'font-lock-constant-face) - (copy-face 'font-lock-preprocessor-face 'font-lock-builtin-face)) - (defun vera-font-lock-match-item (limit) "Match, and move over, any declaration item after point. Adapted from `font-lock-match-c-style-declaration-item-and-skip-to-next'." @@ -671,23 +664,23 @@ Adapted from `font-lock-match-c-style-declaration-item-and-skip-to-next'." "Face name to use for interface names.") (defface vera-font-lock-number - '((((class color) (background light)) (:foreground "Gold4")) - (((class color) (background dark)) (:foreground "BurlyWood1")) - (t (:italic t :bold t))) + '((((class color) (background light)) :foreground "Gold4") + (((class color) (background dark)) :foreground "BurlyWood1") + (t :slant italic :weight bold)) "Font lock mode face used to highlight @ definitions." :group 'font-lock-highlighting-faces) (defface vera-font-lock-function - '((((class color) (background light)) (:foreground "DarkCyan")) - (((class color) (background dark)) (:foreground "Orchid1")) - (t (:italic t :bold t))) + '((((class color) (background light)) :foreground "DarkCyan") + (((class color) (background dark)) :foreground "Orchid1") + (t :slant italic :weight bold)) "Font lock mode face used to highlight predefined functions and tasks." :group 'font-lock-highlighting-faces) (defface vera-font-lock-interface - '((((class color) (background light)) (:foreground "Grey40")) - (((class color) (background dark)) (:foreground "Grey80")) - (t (:italic t :bold t))) + '((((class color) (background light)) :foreground "Grey40") + (((class color) (background dark)) :foreground "Grey80") + (t :slant italic :weight bold)) "Font lock mode face used to highlight interface names." :group 'font-lock-highlighting-faces) @@ -1077,7 +1070,7 @@ try to increase performance by using this macro." (save-excursion (beginning-of-line) (let ((indent-point (point)) - syntax state placeholder pos) + syntax state placeholder) ;; determine syntax state (setq state (parse-partial-sexp (point-min) (point))) (cond @@ -1240,7 +1233,7 @@ Calls `indent-region' for whole buffer." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; electrifications -(defun vera-electric-tab (&optional prefix-arg) +(defun vera-electric-tab (&optional prefix) "Do what I mean (indent, expand, tab, change indent, etc..). If preceding character is part of a word or a paren then `hippie-expand', else if right of non whitespace on line then `tab-to-tab-stop', @@ -1260,7 +1253,7 @@ If `vera-intelligent-tab' is nil, always indent line." (or (and (boundp 'hippie-expand-only-buffers) hippie-expand-only-buffers) '(vera-mode)))) - (vera-expand-abbrev prefix-arg))) + (vera-expand-abbrev prefix))) ((> (current-column) (current-indentation)) (tab-to-tab-stop)) ((and (or (eq last-command 'vera-electric-tab) @@ -1402,7 +1395,7 @@ If `vera-intelligent-tab' is nil, always indent line." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Comments -(defun vera-comment-uncomment-region (beg end &optional arg) +(defun vera-comment-uncomment-region (beg end &optional _arg) "Comment region if not commented, uncomment region if already commented." (interactive "r\nP") (goto-char beg) @@ -1430,7 +1423,8 @@ If `vera-intelligent-tab' is nil, always indent line." ;;; Bug reports ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defconst vera-mode-help-address "Reto Zimmermann " +(defconst vera-mode-help-address + "Reto Zimmermann , bug-gnu-emacs@gnu.org" "Address for Vera Mode bug reports.") ;; get reporter-submit-bug-report when byte-compiling