Merge branch 'maint'

* maint:
Documentation: Remove an odd "instead"
fix portability problem with IS_RUN_COMMAND_ERR
mailmap: resurrect lower-casing of email addresses

diff --combined mailmap.c
index 654c6295cb10eaf5e0b8af1d4e185f8d1ff7663b,6be91b60dfc8c37bd21c45d1480f7b3cf1fe5a99..bb1f2fb711a588d2af0d61decbd4b3eb2f2aebbe
--- 1/mailmap.c
--- 2/mailmap.c
+++ b/mailmap.c
@@@ -50,6 -50,15 +50,15 @@@ static void add_mapping(struct string_l
  {
        struct mailmap_entry *me;
        int index;
+       char *p;
+ 
+       if (old_email)
+               for (p = old_email; *p; p++)
+                       *p = tolower(*p);
+       if (new_email)
+               for (p = new_email; *p; p++)
+                       *p = tolower(*p);
+ 
        if (old_email == NULL) {
                old_email = new_email;
                new_email = NULL;
@@@ -90,8 -99,7 +99,8 @@@
                 old_name, old_email, new_name, new_email);
  }
  
 -static char *parse_name_and_email(char *buffer, char **name, char **email)
 +static char *parse_name_and_email(char *buffer, char **name,
 +              char **email, int allow_empty_email)
  {
        char *left, *right, *nstart, *nend;
        *name = *email = 0;
@@@ -100,7 -108,7 +109,7 @@@
                return NULL;
        if ((right = strchr(left+1, '>')) == NULL)
                return NULL;
 -      if (left+1 == right)
 +      if (!allow_empty_email && (left+1 == right))
                return NULL;
  
        /* remove whitespace from beginning and end of name */
@@@ -151,8 -159,8 +160,8 @@@ static int read_single_mailmap(struct s
                        }
                        continue;
                }
 -              if ((name2 = parse_name_and_email(buffer, &name1, &email1)) != NULL)
 -                      parse_name_and_email(name2, &name2, &email2);
 +              if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
 +                      parse_name_and_email(name2, &name2, &email2, 1);
  
                if (email1)
                        add_mapping(map, name1, email1, name2, email2);