aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2005-10-08 04:47:23 +0000
committerGlenn Morris2005-10-08 04:47:23 +0000
commit9877fcf1d069db3b98f6ec36e77123d1eaeb2dfb (patch)
tree1aa8477902ac33b694af4b73929d3dcd0160c017
parent6f1371898766cdf01267e8b01427ce1cedfc7f70 (diff)
downloademacs-9877fcf1d069db3b98f6ec36e77123d1eaeb2dfb.tar.gz
emacs-9877fcf1d069db3b98f6ec36e77123d1eaeb2dfb.zip
(f90-keywords-re, f90-mode): Doc fix.
(f90-font-lock-keywords-2, f90-mode-abbrev-table): Add `double precision'.
-rw-r--r--lisp/progmodes/f90.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 5e2a3705ef3..676833cdedc 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -4,7 +4,7 @@
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se> 6;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
7;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk> 7;; Maintainer: Glenn Morris <rgm@gnu.org>
8;; Keywords: fortran, f90, languages 8;; Keywords: fortran, f90, languages
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
@@ -276,7 +276,7 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil."
276 "target" "then" "type" "use" "where" "while" "write" 276 "target" "then" "type" "use" "where" "while" "write"
277 ;; F95 keywords. 277 ;; F95 keywords.
278 "elemental" "pure") 'words) 278 "elemental" "pure") 'words)
279 "Regexp for F90 keywords.") 279 "Regexp used by the function `f90-change-keywords'.")
280 280
281(defconst f90-keywords-level-3-re 281(defconst f90-keywords-level-3-re
282 (regexp-opt 282 (regexp-opt
@@ -370,7 +370,8 @@ subroutine\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?"
370 (list 370 (list
371 ;; Variable declarations (avoid the real function call). 371 ;; Variable declarations (avoid the real function call).
372 '("^[ \t0-9]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|\ 372 '("^[ \t0-9]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|\
373logical\\|type[ \t]*(\\sw+)\\)\\(.*::\\|[ \t]*(.*)\\)?\\([^&!\n]*\\)" 373logical\\|double[ \t]*precision\\|*type[ \t]*(\\sw+)\\)\
374\\(.*::\\|[ \t]*(.*)\\)?\\([^&!\n]*\\)"
374 (1 font-lock-type-face t) (4 font-lock-variable-name-face t)) 375 (1 font-lock-type-face t) (4 font-lock-variable-name-face t))
375 ;; do, if, select, where, and forall constructs. 376 ;; do, if, select, where, and forall constructs.
376 '("\\<\\(end[ \t]*\\(do\\|if\\|select\\|forall\\|where\\)\\)\\>\ 377 '("\\<\\(end[ \t]*\\(do\\|if\\|select\\|forall\\|where\\)\\)\\>\
@@ -381,7 +382,7 @@ do\\([ \t]*while\\)?\\|select[ \t]*case\\|where\\|forall\\)\\)\\>"
381 (2 font-lock-constant-face nil t) (3 font-lock-keyword-face)) 382 (2 font-lock-constant-face nil t) (3 font-lock-keyword-face))
382 ;; Implicit declaration. 383 ;; Implicit declaration.
383 '("\\<\\(implicit\\)[ \t]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\ 384 '("\\<\\(implicit\\)[ \t]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\
384\\|logical\\|type[ \t]*(\\sw+)\\|none\\)[ \t]*" 385\\|logical\\|double[ \t]*precision\\|type[ \t]*(\\sw+)\\|none\\)[ \t]*"
385 (1 font-lock-keyword-face) (2 font-lock-type-face)) 386 (1 font-lock-keyword-face) (2 font-lock-type-face))
386 '("\\<\\(namelist\\|common\\)[ \t]*\/\\(\\sw+\\)?\/" 387 '("\\<\\(namelist\\|common\\)[ \t]*\/\\(\\sw+\\)?\/"
387 (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) 388 (1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
@@ -698,6 +699,7 @@ Used in the F90 entry in `hs-special-modes-alist'.")
698 ("`de" "deallocate" ) 699 ("`de" "deallocate" )
699 ("`df" "define" ) 700 ("`df" "define" )
700 ("`di" "dimension" ) 701 ("`di" "dimension" )
702 ("`dp" "double precision")
701 ("`dw" "do while" ) 703 ("`dw" "do while" )
702 ("`el" "else" ) 704 ("`el" "else" )
703 ("`eli" "else if" ) 705 ("`eli" "else if" )
@@ -796,8 +798,6 @@ Variables controlling indentation style and extra features:
796 The possibilities are 'downcase-word, 'upcase-word, 'capitalize-word. 798 The possibilities are 'downcase-word, 'upcase-word, 'capitalize-word.
797`f90-leave-line-no' 799`f90-leave-line-no'
798 Do not left-justify line numbers (default nil). 800 Do not left-justify line numbers (default nil).
799`f90-keywords-re'
800 List of keywords used for highlighting/upcase-keywords etc.
801 801
802Turning on F90 mode calls the value of the variable `f90-mode-hook' 802Turning on F90 mode calls the value of the variable `f90-mode-hook'
803with no args, if that value is non-nil." 803with no args, if that value is non-nil."