diff lisp/modes/fortran.el @ 151:59463afc5666 r20-3b2

Import from CVS: tag r20-3b2
author cvs
date Mon, 13 Aug 2007 09:37:19 +0200
parents 34a5b81f86ba
children
line wrap: on
line diff
--- a/lisp/modes/fortran.el	Mon Aug 13 09:36:20 2007 +0200
+++ b/lisp/modes/fortran.el	Mon Aug 13 09:37:19 2007 +0200
@@ -228,18 +228,20 @@
   (setq fortran-mode-syntax-table (make-syntax-table))
   (modify-syntax-entry ?\; "w" fortran-mode-syntax-table)
   (modify-syntax-entry ?\r " " fortran-mode-syntax-table)
-  (modify-syntax-entry ?+ "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?- "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?= "." fortran-mode-syntax-table)
+  (modify-syntax-entry ?+  "." fortran-mode-syntax-table)
+  (modify-syntax-entry ?-  "." fortran-mode-syntax-table)
+  (modify-syntax-entry ?=  "." fortran-mode-syntax-table)
   ;; XEmacs change
   ;;(modify-syntax-entry ?* "." fortran-mode-syntax-table)
-  (modify-syntax-entry ?/ "." fortran-mode-syntax-table)
+  (modify-syntax-entry ?/  "."  fortran-mode-syntax-table)
   (modify-syntax-entry ?\' "\"" fortran-mode-syntax-table)
   (modify-syntax-entry ?\" "\"" fortran-mode-syntax-table)
-  (modify-syntax-entry ?\\ "/" fortran-mode-syntax-table)
-  (modify-syntax-entry ?. "w" fortran-mode-syntax-table)
-  (modify-syntax-entry ?_ "w" fortran-mode-syntax-table)
-  (modify-syntax-entry ?\! "<" fortran-mode-syntax-table)
+  (modify-syntax-entry ?\\ "/"  fortran-mode-syntax-table)
+  (modify-syntax-entry ?.  "_"  fortran-mode-syntax-table)
+  (modify-syntax-entry ?_  "_"  fortran-mode-syntax-table)
+  (modify-syntax-entry ?$  "_"  fortran-mode-syntax-table)
+  (modify-syntax-entry ?@  "_"  fortran-mode-syntax-table)
+  (modify-syntax-entry ?\! "<"  fortran-mode-syntax-table)
   ;; XEmacs change
   ;;(modify-syntax-entry ?\n ">" fortran-mode-syntax-table)
 
@@ -319,7 +321,7 @@
     ;;
     ;; Program, subroutine and function declarations, plus calls.
     (list (concat "\\<\\(block[ \t]*data\\|call\\|entry\\|function\\|"
-		  "program\\|subroutine\\)\\>[ \t]*\\(\\sw+\\)?")
+		  "program\\|subroutine\\)\\>[ \t]*\\(\\(\\sw\\|\\s_\\)+\\)?")
 	  '(1 font-lock-keyword-face)
 	  '(2 font-lock-function-name-face nil t))))
 
@@ -1687,8 +1689,7 @@
 		  (fortran-break-line))))))
     ))
 (defun fortran-break-line ()
-  (let ((opoint (point))
-	(bol (save-excursion (beginning-of-line) (point)))
+  (let ((bol (save-excursion (beginning-of-line) (point)))
 	(eol (save-excursion (end-of-line) (point)))
 	(comment-string nil))