From: Glenn Morris <rgm@gnu.org>
Date: Wed, 1 Jul 2009 07:13:55 +0000 (+0000)
Subject: (f90-break-delimiters, f90-no-break-re): Doc fixes.
X-Git-Tag: emacs-pretest-23.1.90~2371
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f150a6009fb53d650921d77288b578401a79b61;p=emacs.git

(f90-break-delimiters, f90-no-break-re): Doc fixes.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36f43c87e25..b8b356ac3d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-01  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/f90.el (f90-break-delimiters, f90-no-break-re): Doc fixes.
+
 2009-07-01  Evangelos Evangelou  <vangelis@email.unc.edu>  (tiny change)
 
 	* progmodes/f90.el (f90-no-break-re): Add "(/" and "/)".  (Bug#3730)
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index bc57db13fda..0b011af9eb5 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -254,9 +254,10 @@ additionally blinks the cursor to the start of the block."
 
 (defcustom f90-break-delimiters "[-+\\*/><=,% \t]"
   "Regexp matching delimiter characters at which lines may be broken.
-There are certain tokens comprised entirely of characters
-matching this regexp that should not be split, and these are
-specified by the constant `f90-no-break-re'."
+There are some common two-character tokens where one or more of
+the members matches this regexp.  Although Fortran allows breaks
+within lexical tokens (provided the next line has a beginning ampersand),
+the constant `f90-no-break-re' ensures that such tokens are not split."
   :type  'regexp
   :group 'f90)
 (put 'f90-break-delimiters 'safe-local-variable 'stringp)
@@ -824,11 +825,12 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
 
 (defconst f90-no-break-re
   (regexp-opt '("**" "//" "=>" ">=" "<=" "==" "/=" "(/" "/)") 'paren)
-  "Regexp specifying where not to break lines when filling.
-This regexp matches certain tokens comprised entirely of
-characters matching the regexp `f90-break-delimiters' that should
-not be split by filling.  Each element is assumed to be two
-characters long.")
+  "Regexp specifying two-character tokens not to split when breaking lines.
+Each token has one or more of the characters from `f90-break-delimiters'.
+Note that if only one of the characters is from that variable,
+then the presence of the token here allows a line-break before or
+after the other character, where a break would not normally be
+allowed.  This minor issue currently only affects \"(/\" and \"/)\".")
 
 (defvar f90-cache-position nil
   "Temporary position used to speed up region operations.")