[Emacs-diffs] emacs/lisp ChangeLog progmodes/f90.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/07/01 07:13:59

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : f90.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15747&r2=1.15748
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/f90.el?cvsroot=emacs&r1=1.120&r2=1.121

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15747
retrieving revision 1.15748
diff -u -b -r1.15747 -r1.15748
--- ChangeLog   1 Jul 2009 02:58:52 -0000       1.15747
+++ ChangeLog   1 Jul 2009 07:13:55 -0000       1.15748
@@ -1,3 +1,7 @@
+2009-07-01  Glenn Morris  <address@hidden>
+
+       * progmodes/f90.el (f90-break-delimiters, f90-no-break-re): Doc fixes.
+
 2009-07-01  Evangelos Evangelou  <address@hidden>  (tiny change)
 
        * progmodes/f90.el (f90-no-break-re): Add "(/" and "/)".  (Bug#3730)

Index: progmodes/f90.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/f90.el,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- progmodes/f90.el    1 Jul 2009 02:58:55 -0000       1.120
+++ progmodes/f90.el    1 Jul 2009 07:13:59 -0000       1.121
@@ -254,9 +254,10 @@
 
 (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 @@
 
 (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.")