diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 19 | ||||
| -rw-r--r-- | lisp/progmodes/f90.el | 12 |
2 files changed, 18 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b2c28d97a1..a93b2868933 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/f90.el (f90-blocks-re): Include the terminating \> in the + surrounding group (bug#14402). + 2013-05-14 Juri Linkov <juri@jurta.org> * subr.el (find-tag-default-as-regexp): Return nil if `tag' is nil. @@ -10,8 +15,8 @@ 2013-05-14 Jean-Philippe Gravel <jpgravel@gmail.com> - * progmodes/gdb-mi.el (gdb-running, gdb-starting): Remove - signals for which replies are never received. + * progmodes/gdb-mi.el (gdb-running, gdb-starting): + Remove signals for which replies are never received. 2013-05-14 Jean-Philippe Gravel <jpgravel@gmail.com> @@ -120,8 +125,8 @@ * progmodes/octave.el (octave-indent-comment): Improve. (octave-eldoc-message-style, octave-eldoc-cache): New variables. - (octave-eldoc-function-signatures, octave-eldoc-function): New - functions. + (octave-eldoc-function-signatures, octave-eldoc-function): + New functions. (octave-mode, inferior-octave-mode): Add eldoc support. 2013-05-11 Richard Stallman <rms@gnu.org> @@ -166,8 +171,8 @@ 2013-05-10 Leo Liu <sdl.web@gmail.com> - * progmodes/octave.el (inferior-octave-completion-table): No - longer a function and all uses changed. Use cache to speed up + * progmodes/octave.el (inferior-octave-completion-table): + No longer a function and all uses changed. Use cache to speed up completion due to bug#11906. (octave-beginning-of-defun): Re-write to be more general. @@ -357,7 +362,7 @@ * progmodes/octave.el (octave-syntax-propertize-function): Change \'s syntax to escape when inside double-quoted strings. (Bug#14332) (octave-font-lock-keywords): Use octave-operator-regexp. - (octave-completion-at-point): Renamed from + (octave-completion-at-point): Rename from octave-completion-at-point-function. (inferior-octave-directory-tracker): Robustify. (octave-text-functions): Remove and fix its uses. No such things diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index a8f53d397d6..d7d0c109452 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -249,8 +249,8 @@ "Qualification of END statements according to the matching block start. For example, change the END that closes an IF block to END IF. If the block has a label, add it as well (unless `f90-smart-end-names' -says not to). Allowed values are 'blink, 'no-blink, and nil. If nil, -nothing is done. The other two settings have the same effect, but 'blink +says not to). Allowed values are `blink', `no-blink', and nil. If nil, +nothing is done. The other two settings have the same effect, but `blink' additionally blinks the cursor to the start of the block." :type '(choice (const blink) (const no-blink) (const nil)) :safe (lambda (value) (memq value '(blink no-blink nil))) @@ -842,14 +842,14 @@ Can be overridden by the value of `font-lock-maximum-decoration'.") ;; Regexps for finding program structures. (defconst f90-blocks-re - (concat "\\(block[ \t]*data\\|" + (concat "\\(\\(?:block[ \t]*data\\|" (regexp-opt '("do" "if" "interface" "function" "module" "program" "select" "subroutine" "type" "where" "forall" ;; F2003. "enum" "associate" ;; F2008. "submodule" "block" "critical")) - "\\)\\_>") + "\\)\\_>\\)") "Regexp potentially indicating a \"block\" of F90 code.") (defconst f90-program-block-re @@ -1138,8 +1138,8 @@ Variables controlling indentation style and extra features: Automatic insertion of \& at beginning of continuation lines (default t). `f90-smart-end' From an END statement, check and fill the end using matching block start. - Allowed values are 'blink, 'no-blink, and nil, which determine - whether to blink the matching beginning (default 'blink). + Allowed values are `blink', `no-blink', and nil, which determine + whether to blink the matching beginning (default `blink'). `f90-auto-keyword-case' Automatic change of case of keywords (default nil). The possibilities are `downcase-word', `upcase-word', `capitalize-word'. |