Merge from mainline.

3 files changed, 10 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a50ee76b96c..5a1b3ff7d5a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-29  Kester Habermann  <kester@linuxtag.org>  (tiny change)
+
+        * etags.c (Fortran_functions): Handle recursive keyword
+        (Bug#5484).
+
 2010-01-11  Glenn Morris  <rgm@gnu.org>
 
         * ebrowse.c (version):
diff --git a/lib-src/etags.c b/lib-src/etags.c
index d49dcf930af..2715df8b5cc 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4108,6 +4108,10 @@ Fortran_functions (inf)
       dbp = skip_spaces (dbp);
       if (*dbp == '\0')
         continue;
+
+      if (LOOKING_AT_NOCASE (dbp, "recursive"))
+        dbp = skip_spaces (dbp);
+
       switch (lowcase (*dbp))
         {
         case 'i':
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index fdbc9e9756c..c38c5c7062e 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION         = 23.1.91
+VERSION         = 23.1.92
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \