aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-07-01 02:58:52 +0000
committerGlenn Morris2009-07-01 02:58:52 +0000
commitb0d5b05b13bce863dbc278127baf36162e2dbebd (patch)
tree6d42f5fa0b25d6435a620b0381391a02365fd965
parent99061dfcf68b52602e134fdb1a0bd3417546f7a8 (diff)
downloademacs-b0d5b05b13bce863dbc278127baf36162e2dbebd.tar.gz
emacs-b0d5b05b13bce863dbc278127baf36162e2dbebd.zip
Evangelos Evangelou <vangelis at email.unc.edu> (tiny change)
(f90-no-break-re): Add "(/" and "/)". (Bug#3730)
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/f90.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd1e3beef14..36f43c87e25 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-07-01 Evangelos Evangelou <vangelis@email.unc.edu> (tiny change)
2
3 * progmodes/f90.el (f90-no-break-re): Add "(/" and "/)". (Bug#3730)
4
12009-06-30 Michael Albinus <michael.albinus@gmx.de> 52009-06-30 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle 7 * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 9048b7b490c..bc57db13fda 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -823,7 +823,7 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
823 "Regexp matching a CLASS/TYPE IS statement.") 823 "Regexp matching a CLASS/TYPE IS statement.")
824 824
825(defconst f90-no-break-re 825(defconst f90-no-break-re
826 (regexp-opt '("**" "//" "=>" ">=" "<=" "==" "/=") 'paren) 826 (regexp-opt '("**" "//" "=>" ">=" "<=" "==" "/=" "(/" "/)") 'paren)
827 "Regexp specifying where not to break lines when filling. 827 "Regexp specifying where not to break lines when filling.
828This regexp matches certain tokens comprised entirely of 828This regexp matches certain tokens comprised entirely of
829characters matching the regexp `f90-break-delimiters' that should 829characters matching the regexp `f90-break-delimiters' that should