HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert last bug-reference-url-format change.
[bpt/emacs.git]
/
lisp
/
progmodes
/
vera-mode.el
diff --git
a/lisp/progmodes/vera-mode.el
b/lisp/progmodes/vera-mode.el
index
17724a1
..
96877a0
100644
(file)
--- a/
lisp/progmodes/vera-mode.el
+++ b/
lisp/progmodes/vera-mode.el
@@
-1,7
+1,7
@@
;;; vera-mode.el --- major mode for editing Vera files.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
;;; 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.
+;; 2006, 2007, 2008
, 2009, 2010
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>
@@
-9,6
+9,11
@@
;; Keywords: languages vera
;; WWW: http://www.iis.ee.ethz.ch/~zimmi/emacs/vera-mode.html
;; Keywords: languages vera
;; WWW: http://www.iis.ee.ethz.ch/~zimmi/emacs/vera-mode.html
+;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this
+;; file on 18/3/2008, and the maintainer agreed that when a bug is
+;; filed in the Emacs bug reporting system against this file, a copy
+;; of the bug report be sent to the maintainer's email address.
+
(defconst vera-version "2.18"
"Vera Mode version number.")
(defconst vera-version "2.18"
"Vera Mode version number.")
@@
-17,10
+22,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-28,9
+33,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Commentary:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Commentary:
@@
-247,7
+250,7
@@
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
(defun vera-mode ()
;;;###autoload
(defun vera-mode ()
@@
-288,7
+291,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
@@
-1258,7
+1261,9
@@
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
(let ((case-fold-search t)
(case-replace nil)
(hippie-expand-only-buffers
@@
-1335,7
+1340,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 ?*)