[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/fortran.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/fortran.el,v |
Date: |
Sat, 26 Apr 2008 02:33:48 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/26 02:33:47
Index: fortran.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/fortran.el,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- fortran.el 13 Mar 2008 03:26:47 -0000 1.144
+++ fortran.el 26 Apr 2008 02:33:47 -0000 1.145
@@ -560,9 +560,9 @@
(defvar fortran-mode-syntax-table
(let ((table (make-syntax-table)))
- ;; We might like `;' to be punctuation (g77 multi-statement
- ;; lines), but that screws abbrevs.
- (modify-syntax-entry ?\; "w" table)
+ ;; Was a word-constituent (for abbrevs), now punctuation (g77
+ ;; multi-statement lines).
+ (modify-syntax-entry ?\; "." table)
(modify-syntax-entry ?\r " " table)
(modify-syntax-entry ?+ "." table)
(modify-syntax-entry ?- "." table)
@@ -670,20 +670,8 @@
"Keymap used in Fortran mode.")
-(defvar fortran-mode-abbrev-table
- (progn
- (define-abbrev-table 'fortran-mode-abbrev-table nil)
- fortran-mode-abbrev-table)
- "Abbrev table for Fortran mode.")
-
-;; Not in defvar because user abbrevs may be restored before this file loads.
-(mapc
- (lambda (e)
- (condition-case nil
- (define-abbrev fortran-mode-abbrev-table (car e) (cdr e) nil :count 0
- :system t)
- (wrong-number-of-arguments ; Emacs 22
- (define-abbrev fortran-mode-abbrev-table (car e) (cdr e) nil 0 t))))
+(define-abbrev-table 'fortran-mode-abbrev-table
+ (mapcar (lambda (e) (list (car e) (cdr e) nil :system t))
'((";au" . "automatic" )
(";b" . "byte" )
(";bd" . "block data" )
@@ -742,6 +730,9 @@
(";vo" . "volatile" )
(";w" . "write" )
(";wh" . "where" )))
+ "Abbrev table for Fortran mode."
+ ;; Accept ; as the first char of an abbrev. Also allow _ in abbrevs.
+ :regexp "\\(?:[^[:word:]_;]\\|^\\)\\(;?[[:word:]_]+\\)[^[:word:]_]*")
;;;###autoload
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/fortran.el,v,
Glenn Morris <=