diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/f90.el | 2 |
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 @@ | |||
| 1 | 2013-05-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/f90.el (f90-imenu-generic-expression): | ||
| 4 | Fix typo in 2013-05-08 change. (Bug#14402) | ||
| 5 | |||
| 1 | 2013-05-14 Jean-Philippe Gravel <jpgravel@gmail.com> | 6 | 2013-05-14 Jean-Philippe Gravel <jpgravel@gmail.com> |
| 2 | 7 | ||
| 3 | * progmodes/gdb-mi.el (gdb-running, gdb-starting): Remove | 8 | * 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." | |||
| 981 | ("Submodules" "^[ \t0-9]*submodule[ \t]*([^)\n]+)[ \t]*\ | 981 | ("Submodules" "^[ \t0-9]*submodule[ \t]*([^)\n]+)[ \t]*\ |
| 982 | \\(\\(?:\\sw\\|\\s_\\)+\\)[ \t]*\\(!\\|$\\)" 1) | 982 | \\(\\(?:\\sw\\|\\s_\\)+\\)[ \t]*\\(!\\|$\\)" 1) |
| 983 | ("Modules" "^[ \t0-9]*module[ \t]+\\(\\(?:\\sw\\|\\s_\\)+\\)[ \t]*\\(!\\|$\\)" 1) | 983 | ("Modules" "^[ \t0-9]*module[ \t]+\\(\\(?:\\sw\\|\\s_\\)+\\)[ \t]*\\(!\\|$\\)" 1) |
| 984 | '("Types" f90-imenu-type-matcher 1) | 984 | ("Types" f90-imenu-type-matcher 1) |
| 985 | ;; Does not handle: "type[, stuff] :: foo". | 985 | ;; Does not handle: "type[, stuff] :: foo". |
| 986 | ;;(format "^[ \t0-9]*type[ \t]+\\(\\(%s\\|i%s\\|is\\(?:\\sw\\|\\s_\\)\\)\\(?:\\sw\\|\\s_\\)*\\)" | 986 | ;;(format "^[ \t0-9]*type[ \t]+\\(\\(%s\\|i%s\\|is\\(?:\\sw\\|\\s_\\)\\)\\(?:\\sw\\|\\s_\\)*\\)" |
| 987 | ;; not-ib not-s) | 987 | ;; not-ib not-s) |