aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2004-01-25 23:42:35 +0000
committerGlenn Morris2004-01-25 23:42:35 +0000
commit6f43f690c6353a62c5d099084f34a8b66f38e1b4 (patch)
tree78ca4327fd841942a1b2d9874c317b81824176d5
parent815617bf0c58de1e1b3fb554d2e62a0e934e464e (diff)
downloademacs-6f43f690c6353a62c5d099084f34a8b66f38e1b4.tar.gz
emacs-6f43f690c6353a62c5d099084f34a8b66f38e1b4.zip
(f90-break-delimiters): Doc fix.
(f90-no-break-re): Add some extra tokens. Doc fix.
-rw-r--r--lisp/progmodes/f90.el15
1 files changed, 11 insertions, 4 deletions
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index a3f44743514..11553a1fdb6 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1,6 +1,6 @@
1;;; f90.el --- Fortran-90 mode (free format) 1;;; f90.el --- Fortran-90 mode (free format)
2 2
3;; Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1995, 1996, 1997, 2000, 2004 Free Software Foundation, Inc.
4 4
5;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se> 5;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
6;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk> 6;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk>
@@ -224,7 +224,10 @@ whether to blink the matching beginning."
224 :group 'f90) 224 :group 'f90)
225 225
226(defcustom f90-break-delimiters "[-+\\*/><=,% \t]" 226(defcustom f90-break-delimiters "[-+\\*/><=,% \t]"
227 "*Regexp holding list of delimiters at which lines may be broken." 227 "*Regexp matching delimiter characters at which lines may be broken.
228There are certain tokens comprised entirely of characters
229matching this regexp that should not be split, and these are
230specified by the constant `f90-no-break-re'."
228 :type 'regexp 231 :type 'regexp
229 :group 'f90) 232 :group 'f90)
230 233
@@ -574,8 +577,12 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
574 "Regexp matching the definition of a derived type.") 577 "Regexp matching the definition of a derived type.")
575 578
576(defconst f90-no-break-re 579(defconst f90-no-break-re
577 (regexp-opt '("**" "//" "=>") 'paren) 580 (regexp-opt '("**" "//" "=>" ">=" "<=" "==" "/=") 'paren)
578 "Regexp specifying where not to break lines when filling.") 581 "Regexp specifying where not to break lines when filling.
582This regexp matches certain tokens comprised entirely of
583characters matching the regexp `f90-break-delimiters' that should
584not be split by filling. Each element is assumed to be two
585characters long.")
579 586
580(defvar f90-cache-position nil 587(defvar f90-cache-position nil
581 "Temporary position used to speed up region operations.") 588 "Temporary position used to speed up region operations.")