Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.

3 files changed, 63 insertions, 19 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b85ba12a5b2..480ddabd44a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,19 @@
+2012-12-02  Kevin Ryde  <user42@zip.com.au>
+
+        * etags.c (Lisp_functions): Skip (defvar foo) declarations unless
+        the --declarations flag is enabled (Bug#5600).
+        (Lisp_help): Update.
+        (skip_name): New function.
+
+2012-12-01  Kevin Ryde  <user42@zip.com.au>
+
+        * etags.c (Perl_functions): Support "use constant" (Bug#5055).
+
+2012-11-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for errno.h (Bug#12968).
+        * movemail.c (main): Assume EAGAIN and EBUSY.
+
 2012-11-23  Paul Eggert  <eggert@cs.ucla.edu>
 
         movemail: treat EACCES etc. failures as permanent
diff --git a/lib-src/etags.c b/lib-src/etags.c
index b6af17b8edf..d393c4d2e4a 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -353,6 +353,7 @@ static void put_entries (node *);
 static char *concat (const char *, const char *, const char *);
 static char *skip_spaces (char *);
 static char *skip_non_spaces (char *);
+static char *skip_name (char *);
 static char *savenstr (const char *, int);
 static char *savestr (const char *);
 static char *etags_strchr (const char *, int);
@@ -619,7 +620,8 @@ static const char Lisp_help [] =
 "In Lisp code, any function defined with `defun', any variable\n\
 defined with `defvar' or `defconst', and in general the first\n\
 argument of any expression that starts with `(def' in column zero\n\
-is a tag.";
+is a tag.\n\
+The `--declarations' option tags \"(defvar foo)\" constructs too.";
 
 static const char *Lua_suffixes [] =
   { "lua", "LUA", NULL };
@@ -4269,6 +4271,7 @@ Asm_labels (FILE *inf)
 /*
  * Perl support
  * Perl sub names: /^sub[ \t\n]+[^ \t\n{]+/
+ *                 /^use constant[ \t\n]+[^ \t\n{=,;]+/
  * Perl variable names: /^(my|local).../
  * Original code by Bart Robinson <lomew@cs.utah.edu> (1995)
  * Additions by Michael Ernst <mernst@alum.mit.edu> (1997)
@@ -4291,9 +4294,10 @@ Perl_functions (FILE *inf)
         }
       else if (LOOKING_AT (cp, "sub"))
         {
-          char *pos;
-          char *sp = cp;
+          char *pos, *sp;
 
+        subr:
+          sp = cp;
           while (!notinname (*cp))
             cp++;
           if (cp == sp)
@@ -4316,8 +4320,21 @@ Perl_functions (FILE *inf)
                         lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
               free (name);
             }
+        }
+      else if (LOOKING_AT (cp, "use constant")
+               || LOOKING_AT (cp, "use constant::defer"))
+        {
+          /* For hash style multi-constant like
+                use constant { FOO => 123,
+                               BAR => 456 };
+             only the first FOO is picked up.  Parsing across the value
+             expressions would be difficult in general, due to possible nested
+             hashes, here-documents, etc.  */
+          if (*cp == '{')
+            cp = skip_spaces (cp+1);
+          goto subr;
         }
-       else if (globals)        /* only if we are tagging global vars */
+      else if (globals) /* only if we are tagging global vars */
         {
           /* Skip a qualifier, if any. */
           bool qual = LOOKING_AT (cp, "my") || LOOKING_AT (cp, "local");
@@ -4732,6 +4749,19 @@ Lisp_functions (FILE *inf)
       if (dbp[0] != '(')
         continue;
 
+      /* "(defvar foo)" is a declaration rather than a definition.  */
+      if (! declarations)
+        {
+          char *p = dbp + 1;
+          if (LOOKING_AT (p, "defvar"))
+            {
+              p = skip_name (p); /* past var name */
+              p = skip_spaces (p);
+              if (*p == ')')
+                continue;
+            }
+        }
+
       if (strneq (dbp+1, "def", 3) || strneq (dbp+1, "DEF", 3))
         {
           dbp = skip_non_spaces (dbp);
@@ -6292,6 +6322,16 @@ skip_non_spaces (char *cp)
   return cp;
 }
 
+/* Skip any chars in the "name" class.*/
+static char *
+skip_name (char *cp)
+{
+  /* '\0' is a notinname() so loop stops there too */
+  while (! notinname (*cp))
+    cp++;
+  return cp;
+}
+
 /* Print error message and exit.  */
 void
 fatal (const char *s1, const char *s2)
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 264b3d292c6..f2b2484c8e3 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -430,22 +430,10 @@ main (int argc, char **argv)
          for certain failure codes.  */
       if (status < 0)
         {
-          if (++lockcount <= 5)
+          if (++lockcount <= 5 && (errno == EAGAIN || errno == EBUSY))
             {
-#ifdef EAGAIN
-              if (errno == EAGAIN)
-                {
-                  sleep (1);
-                  goto retry_lock;
-                }
-#endif
-#ifdef EBUSY
-              if (errno == EBUSY)
-                {
-                  sleep (1);
-                  goto retry_lock;
-                }
-#endif
+              sleep (1);
+              goto retry_lock;
             }
 
           pfatal_with_name (inname);