X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ed7f1a6c5caaf4159125c08db5d18c5471fdd032..724bc2658767f0e2c11b3fbe9ec72490ef30cbb2:/lisp/progmodes/vera-mode.el diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el index 1f33f5f3aa..443472192b 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 -;; Copyright (C) 1997-2011 Free Software Foundation, Inc. +;; Copyright (C) 1997-2013 Free Software Foundation, Inc. ;; Author: Reto Zimmermann ;; Maintainer: Reto Zimmermann @@ -90,20 +90,22 @@ :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." :type 'boolean :group 'vera) +(make-obsolete-variable 'vera-underscore-is-part-of-word + 'superword-mode "24.4") (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 +312,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 +429,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 +440,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 +589,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 +666,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) @@ -1360,6 +1355,11 @@ If `vera-intelligent-tab' is nil, always indent line." (defvar vera-expand-upper-case nil) (eval-when-compile (require 'hippie-exp)) +(declare-function he-init-string "hippie-exp" (beg end)) +(declare-function he-dabbrev-beg "hippie-exp" ()) +(declare-function he-string-member "hippie-exp" (str lst &optional trans-case)) +(declare-function he-reset-string "hippie-exp" ()) +(declare-function he-substitute-string "hippie-exp" (str &optional trans-case)) (defun vera-try-expand-abbrev (old) "Try expanding abbreviations from `vera-abbrev-list'." @@ -1430,7 +1430,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