summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-05-14 15:29:35 -0400
committerGlenn Morris <rgm@gnu.org>2013-05-14 15:29:35 -0400
commit0ac0fecb1517ea7fd82e25c365528c8c44d1c11e (patch)
tree3cbf10e67b6c5d403e2eaac1e0cbbacd7c9c13c3
parent2e78e6a7949165d17081d375681393c5f9845dc6 (diff)
downloademacs-0ac0fecb1517ea7fd82e25c365528c8c44d1c11e.tar.gz
* f90.el (f90-imenu-generic-expression): Fix typo in 2013-05-08 change.
(Bug#14402)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/f90.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4207866beb5..d39c434cb6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-14 Glenn Morris <rgm@gnu.org>
+
+ * progmodes/f90.el (f90-imenu-generic-expression):
+ Fix typo in 2013-05-08 change. (Bug#14402)
+
2013-05-14 Jean-Philippe Gravel <jpgravel@gmail.com>
* progmodes/gdb-mi.el (gdb-running, gdb-starting): Remove
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 3471bbbe384..a8f53d397d6 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -981,7 +981,7 @@ Set subexpression 1 in the match-data to the name of the type."
("Submodules" "^[ \t0-9]*submodule[ \t]*([^)\n]+)[ \t]*\
\\(\\(?:\\sw\\|\\s_\\)+\\)[ \t]*\\(!\\|$\\)" 1)
("Modules" "^[ \t0-9]*module[ \t]+\\(\\(?:\\sw\\|\\s_\\)+\\)[ \t]*\\(!\\|$\\)" 1)
- '("Types" f90-imenu-type-matcher 1)
+ ("Types" f90-imenu-type-matcher 1)
;; Does not handle: "type[, stuff] :: foo".
;;(format "^[ \t0-9]*type[ \t]+\\(\\(%s\\|i%s\\|is\\(?:\\sw\\|\\s_\\)\\)\\(?:\\sw\\|\\s_\\)*\\)"
;; not-ib not-s)