diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
| commit | 4b739f70a54579b134ab6da313a3d665640a6a3f (patch) | |
| tree | a5c8bba0bd10e8c4b2de062d6a5f905ac139f121 /lisp/progmodes/fortran.el | |
| parent | 540bfa7680268a55fc617ffb822e962cb9fb6c59 (diff) | |
| parent | 43662a240b682de94299e797452ba56d01a04883 (diff) | |
| download | emacs-4b739f70a54579b134ab6da313a3d665640a6a3f.tar.gz emacs-4b739f70a54579b134ab6da313a3d665640a6a3f.tar.bz2 emacs-4b739f70a54579b134ab6da313a3d665640a6a3f.zip | |
Merge from origin/emacs-25
43662a2 ; Clarify that xref is still experimental
0a6e6ca ; * admin/release-process: Remove some obsolete records.
c2e9e3d * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
8637f3d (semantic-symref-derive-find-filepatterns): Return a list
0a7ad07 ; Re-arrange xref-related entries in NEWS.
fe903ef Fix xref-find-references on MS-Windows
55a28d8 ; Fixed visual bell artifact problem on NextStep.
d064034 Document new features of tildify-mode
964bea7 Document new features of Whitespace mode
cd68f47 Improve documentation of new Hide-IfDef features
723b8bf Fix regression in font-locking cl-assert and cl-check-type
Diffstat (limited to 'lisp/progmodes/fortran.el')
| -rw-r--r-- | lisp/progmodes/fortran.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 82e81b23f50..bd08d3fd16d 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -496,12 +496,12 @@ This is used to fontify fixed-format Fortran comments." ;; worth the trouble (about 0.5% of slow down). (eval ;I hate `eval', but it's hard to avoid it here. `(syntax-propertize-rules - ("^[cd\\*]" (0 "<")) + ("^[CcDd\\*]" (0 "<")) ;; We mark all chars after line-length as "comment-start", rather than ;; just the first one. This is so that a closing ' that's past the ;; line-length will indeed be ignored (and will result in a string that ;; leaks into subsequent lines). - ((format "^[^cd\\*\t\n].\\{%d\\}\\(.+\\)" (1- line-length)) + ((format "^[^CcDd\\*\t\n].\\{%d\\}\\(.+\\)" (1- line-length)) (1 "<"))))) (defvar fortran-font-lock-keywords fortran-font-lock-keywords-1 |