HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lisp/progmodes/js.el (js-mode): Don't stomp on global settings.
[bpt/emacs.git]
/
lisp
/
progmodes
/
vera-mode.el
diff --git
a/lisp/progmodes/vera-mode.el
b/lisp/progmodes/vera-mode.el
index
b8c5850
..
1f33f5f
100644
(file)
--- a/
lisp/progmodes/vera-mode.el
+++ b/
lisp/progmodes/vera-mode.el
@@
-1,7
+1,6
@@
-;;; vera-mode.el --- major mode for editing Vera files
.
+;;; vera-mode.el --- major mode for editing Vera files
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2011 Free Software Foundation, Inc.
;; Author: Reto Zimmermann <reto@gnu.org>
;; Maintainer: Reto Zimmermann <reto@gnu.org>
;; Author: Reto Zimmermann <reto@gnu.org>
;; Maintainer: Reto Zimmermann <reto@gnu.org>
@@
-250,10
+249,10
@@
If nil, TAB always indents current line."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Mode definition
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Mode definition
-;;;###autoload (add-to-list 'auto-mode-alist
'("\\.vr[hi]?\\'" .
vera-mode))
+;;;###autoload (add-to-list 'auto-mode-alist
(cons (purecopy "\\.vr[hi]?\\'") '
vera-mode))
;;;###autoload
;;;###autoload
-(def
un vera-mode ()
+(def
ine-derived-mode vera-mode prog-mode "Vera"
"Major mode for editing Vera code.
Usage:
"Major mode for editing Vera code.
Usage:
@@
-291,7
+290,7
@@
Add a description of the problem and include a reproducible test case.
Feel free to send questions and enhancement requests to <reto@gnu.org>.
Official distribution is at
Feel free to send questions and enhancement requests to <reto@gnu.org>.
Official distribution is at
-<http://www.iis.ee.ethz.ch/~zimmi/emacs/vera-mode.html>.
+URL `http://www.iis.ee.ethz.ch/~zimmi/emacs/vera-mode.html'
The Vera Mode Maintainer
The Vera Mode Maintainer
@@
-301,13
+300,6
@@
Key bindings:
-------------
\\{vera-mode-map}"
-------------
\\{vera-mode-map}"
- (interactive)
- (kill-all-local-variables)
- (setq major-mode 'vera-mode)
- (setq mode-name "Vera")
- ;; set maps and tables
- (use-local-map vera-mode-map)
- (set-syntax-table vera-mode-syntax-table)
;; set local variables
(require 'cc-cmds)
(set (make-local-variable 'comment-start) "//")
;; set local variables
(require 'cc-cmds)
(set (make-local-variable 'comment-start) "//")
@@
-328,9
+320,7
@@
Key bindings:
;; add menu (XEmacs)
(easy-menu-add vera-mode-menu)
;; miscellaneous
;; add menu (XEmacs)
(easy-menu-add vera-mode-menu)
;; miscellaneous
- (message "Vera Mode %s. Type C-c C-h for documentation." vera-version)
- ;; run hooks
- (run-hooks 'vera-mode-hook))
+ (message "Vera Mode %s. Type C-c C-h for documentation." vera-version))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@
-770,7
+760,7
@@
the offset is simply returned."
relpos 0)
(setq offset (vera-evaluate-offset offset langelem symbol)))
(+ (if (and relpos
relpos 0)
(setq offset (vera-evaluate-offset offset langelem symbol)))
(+ (if (and relpos
- (< relpos (
save-excursion (beginning-of-line) (point)
)))
+ (< relpos (
line-beginning-position
)))
(save-excursion
(goto-char relpos)
(current-column))
(save-excursion
(goto-char relpos)
(current-column))
@@
-1087,7
+1077,7
@@
try to increase performance by using this macro."
(save-excursion
(beginning-of-line)
(let ((indent-point (point))
(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
;; determine syntax state
(setq state (parse-partial-sexp (point-min) (point)))
(cond
@@
-1250,7
+1240,7
@@
Calls `indent-region' for whole buffer."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; electrifications
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 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',
"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',
@@
-1261,14
+1251,16
@@
If `vera-intelligent-tab' is nil, always indent line."
(interactive "*P")
(if vera-intelligent-tab
(progn
(interactive "*P")
(if vera-intelligent-tab
(progn
- (cond ((memq (char-syntax (preceding-char)) '(?w ?_))
+ (cond ((and (not (featurep 'xemacs)) (use-region-p))
+ (vera-indent-region (region-beginning) (region-end) nil))
+ ((memq (char-syntax (preceding-char)) '(?w ?_))
(let ((case-fold-search t)
(case-replace nil)
(hippie-expand-only-buffers
(or (and (boundp 'hippie-expand-only-buffers)
hippie-expand-only-buffers)
'(vera-mode))))
(let ((case-fold-search t)
(case-replace nil)
(hippie-expand-only-buffers
(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)
((> (current-column) (current-indentation))
(tab-to-tab-stop))
((and (or (eq last-command 'vera-electric-tab)
@@
-1338,7
+1330,7
@@
If `vera-intelligent-tab' is nil, always indent line."
(interactive "*P")
(let* ((ch (char-before))
(indentp (and (not arg)
(interactive "*P")
(let* ((ch (char-before))
(indentp (and (not arg)
- (eq last-command-
char
?/)
+ (eq last-command-
event
?/)
(or (and (eq ch ?/)
(not (vera-in-literal)))
(and (eq ch ?*)
(or (and (eq ch ?/)
(not (vera-in-literal)))
(and (eq ch ?*)
@@
-1410,7
+1402,7
@@
If `vera-intelligent-tab' is nil, always indent line."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Comments
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; 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)
"Comment region if not commented, uncomment region if already commented."
(interactive "r\nP")
(goto-char beg)
@@
-1480,5
+1472,4
@@
If `vera-intelligent-tab' is nil, always indent line."
(provide 'vera-mode)
(provide 'vera-mode)
-;; arch-tag: 22eae722-7ac5-47ac-a713-c4db1cf623a9
;;; vera-mode.el ends here
;;; vera-mode.el ends here