Merge branch 'master' into xwidget

6 files changed, 110 insertions, 370 deletions

diff --git a/lib-src/.gitignore b/lib-src/.gitignore
deleted file mode 100644
index c931a15d7b6..00000000000
--- a/lib-src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-DOC
-ctags.c
-stamp_BLD
-echolisp.tmp
-
-oo/
-oo-spd/
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 199d46f4984..9b6c0daf210 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,48 @@
+2014-12-14  Glenn Morris  <rgm@gnu.org>
+
+        * grep-changelog: Remove file.
+        * Makefile.in (INSTALLABLE_SCRIPTS): Remove.
+        (all, install, uninstall): Remove INSTALLABLE_SCRIPTS.
+
+2014-11-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (emacsclient.res): Fix yesterday's thinko.
+
+2014-11-22  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc
+        now being in the build directory, not the source directory.
+
+        * Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico.
+
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+        * Merge in all changes up to 24.4 release.
+
+2014-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        movemail: don't dump core if the current time is outlandish
+        * movemail.c (popmail): Check for mbx_delimit_begin failure.
+        (mbx_delimit_begin): Fail if the current time is so outlandish
+        that localtime would fail or asctime would have undefined
+        behavior.  Use strftime to avoid asctime undefined behavior.
+
+2014-09-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        --enable-silent-rules now suppresses more chatter.
+        * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_)
+        (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0)
+        (am__v_CCLD_1): New macros, taken from Automake.
+        (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT})
+        (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
+        (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT})
+        (emacsclientw${EXEEXT}, ntlib.o, hexl${EXEEXT})
+        (update-game-score${EXEEXT}): Use them.
+
+        * etags.c (emacs_strchr, emacs_strrchr): Remove.
+        All uses replaced by strchr and strrchr, which are on all
+        target platforms now.
+
 2014-07-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use "b" flag more consistently; avoid "t" (Bug#18006).
@@ -2972,7 +3017,7 @@
         filter), show help instead of blindingly dumping every single
         ChangeLog available.  Doc fix.  Update version.
 
-2006-11-02  Tim Van Holder  <tim.vanholder@gmail.com>  (tiny change)
+2006-11-02  Tim Van Holder  <tim.vanholder@gmail.com>
 
         * emacsclient.c [WINDOWSNT]: Define HAVE_INET_SOCKETS.
         [!WINDOWSNT]: Include <netinet/in.h> if available.
@@ -2997,7 +3042,7 @@
         (set_tcp_socket): Prefer O_NONBLOCK, then O_NDELAY, then FIONBIO
         to set the socket in non-blocking mode.
 
-2006-10-31  Tim Van Holder  <tim.vanholder@gmail.com>  (tiny change)
+2006-10-31  Tim Van Holder  <tim.vanholder@gmail.com>
 
         * emacsclient.c [!WINDOWSNT]: Include <netinet/in.h> and <sys/ioctl.h>.
         (INVALID_SOCKET): Define.
@@ -7711,7 +7756,7 @@
         (consider_token): DEFUNs now treated like funcs in ctags mode.
 
         * etags.c (LEVEL_OK_FOR_FUNCDEF): Remove.
-        (C_entries): Optimized the test that used LEVEL_OK_FOR_FUNCDEF.
+        (C_entries): Optimize the test that used LEVEL_OK_FOR_FUNCDEF.
         (C_entries): Remove a piece of useless code.
         (C_entries): Making typedef tags is delayed until a semicolon
         is met.  This handles "typedef int X, Y, Z;" correctly.
@@ -8111,7 +8156,7 @@
         * Makefile.in (prefix, bindir, libdir, srcdir): New variables, as
         described in the top-level Makefile.
         (UTILITIES): Add make-path to the list of utility programs.
-        (../arch-lib): Replaced by the ${archlibdir} target, which places
+        (../arch-lib): Replace by the ${archlibdir} target, which places
         the executables in their permanent home.
         (install, install.sysv, install.xenix): Consolidated into one
         target which should work under all circumstances, modulo a few
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 7eb13f667ec..cae0898a2c4 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -45,6 +45,19 @@ UPDATE_MANIFEST = @UPDATE_MANIFEST@
 # Program name transformation.
 TRANSFORM = @program_transform_name@
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 =
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / Mac OS X.
@@ -124,8 +137,6 @@ CLIENTW = @CLIENTW@
 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
                ebrowse${EXEEXT}
 
-INSTALLABLE_SCRIPTS = grep-changelog
-
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
 UTILITIES = profile${EXEEXT} movemail${EXEEXT} hexl${EXEEXT} \
@@ -202,7 +213,7 @@ CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 # Configuration files for .o files to depend on.
 config_h = ../src/config.h $(srcdir)/../src/conf_post.h
 
-all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
+all: ${EXE_FILES} ${SCRIPTS}
 
 .PHONY: all need-blessmail maybe-blessmail
 
@@ -268,17 +279,11 @@ install: $(DESTDIR)${archlibdir}
         for file in ${INSTALLABLES} ; do \
           $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
         done
-        for file in ${INSTALLABLE_SCRIPTS} ; do \
-          $(INSTALL_SCRIPT) ${srcdir}/$${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'`  ; \
-        done
 
 uninstall:
         for file in ${INSTALLABLES}; do \
           rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
         done
-        for file in ${INSTALLABLE_SCRIPTS}; do \
-          rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \
-        done
         if [ -d "$(DESTDIR)${archlibdir}" ]; then \
           (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES} ${SCRIPTS}) \
         fi
@@ -311,7 +316,7 @@ TAGS: etags${EXEEXT}
         $(MAKE) -C ../lib libgnu.a
 
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
-        ${CC} -c ${CPP_CFLAGS} $<
+        $(AM_V_CC)$(CC) -c $(CPP_CFLAGS) $<
 
 
 etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
@@ -319,41 +324,41 @@ etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
 etags_libs = regex.o $(LOADLIBES) $(NTLIB)
 
 etags${EXEEXT}: ${etags_deps}
-        $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
 
 ## ctags.c is distinct from etags.c so that parallel makes do not write two
 ## etags.o files on top of each other.
 ## FIXME?
 ## Can't we use a wrapper that calls 'etags --ctags'?
 ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
-        $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
 
 ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
                    $(config_h)
-        $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
           $< $(LOADLIBES) $(NTLIB) -o $@
 
 profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
           $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@
 
 make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@
 
 movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
           $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@
 
 pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h)
-        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $<
+        $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $<
 
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
            -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \
            $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
 
 emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h)
-        $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \
            -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \
            $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
 
@@ -365,16 +370,17 @@ NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \
 # The dependency on $(NTDEPS) is a trick intended to cause recompile of
 # programs on MinGW whenever some private header in nt/inc is modified.
 ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS)
-        $(CC) -c ${CPP_CFLAGS} $<
+        $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} $<
 
 hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@
 
 update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} \
+          -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
           $< $(LOADLIBES) $(NTLIB) -o $@
 
-emacsclient.res: $(NTINC)/../emacsclient.rc
+emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
         $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
 
 ## Makefile ends here.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index ae5491a8204..6639ac4f235 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -314,7 +314,7 @@ static long readline_internal (linebuffer *, FILE *);
 static bool nocase_tail (const char *);
 static void get_tag (char *, char **);
 
-static void analyse_regex (char *);
+static void analyze_regex (char *);
 static void free_regexps (void);
 static void regex_tag_multiline (void);
 static void error (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2);
@@ -339,8 +339,6 @@ 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);
-static char *etags_strrchr (const char *, int);
 static char *etags_getcwd (void);
 static char *relative_filename (char *, char *);
 static char *absolute_filename (char *, char *);
@@ -1209,7 +1207,7 @@ main (int argc, char **argv)
           lang = argbuffer[i].lang;
           break;
         case at_regexp:
-          analyse_regex (argbuffer[i].what);
+          analyze_regex (argbuffer[i].what);
           break;
         case at_filename:
               this_file = argbuffer[i].what;
@@ -1334,8 +1332,8 @@ get_compressor_from_suffix (char *file, char **extptr)
 
   /* File has been processed by canonicalize_filename,
      so we don't need to consider backslashes on DOS_NT.  */
-  slash = etags_strrchr (file, '/');
-  suffix = etags_strrchr (file, '.');
+  slash = strrchr (file, '/');
+  suffix = strrchr (file, '.');
   if (suffix == NULL || suffix < slash)
     return NULL;
   if (extptr != NULL)
@@ -1422,7 +1420,7 @@ get_language_from_filename (char *file, int case_sensitive)
           return lang;
 
   /* If not found, try suffix after last dot. */
-  suffix = etags_strrchr (file, '.');
+  suffix = strrchr (file, '.');
   if (suffix == NULL)
     return NULL;
   suffix += 1;
@@ -1699,7 +1697,7 @@ find_entries (FILE *inf)
       /* Set lp to point at the first char after the last slash in the
          line or, if no slashes, at the first nonblank.  Then set cp to
          the first successive blank and terminate the string. */
-      lp = etags_strrchr (lb.buffer+2, '/');
+      lp = strrchr (lb.buffer+2, '/');
       if (lp != NULL)
         lp += 1;
       else
@@ -1884,9 +1882,9 @@ pfnote (char *name, bool is_func, char *linestart, int linelen, int lno,
   /* If ctags mode, change name "main" to M<thisfilename>. */
   if (CTAGS && !cxref_style && streq (name, "main"))
     {
-      register char *fp = etags_strrchr (curfdp->taggedfname, '/');
+      char *fp = strrchr (curfdp->taggedfname, '/');
       np->name = concat ("M", fp == NULL ? curfdp->taggedfname : fp + 1, "");
-      fp = etags_strrchr (np->name, '.');
+      fp = strrchr (np->name, '.');
       if (fp != NULL && fp[1] != '\0' && fp[2] == '\0')
         fp[0] = '\0';
     }
@@ -4116,7 +4114,7 @@ Ada_funcs (FILE *inf)
           /* Skip a string i.e. "abcd". */
           if (inquote || (*dbp == '"'))
             {
-              dbp = etags_strchr (dbp + !inquote, '"');
+              dbp = strchr (dbp + !inquote, '"');
               if (dbp != NULL)
                 {
                   inquote = false;
@@ -4274,7 +4272,7 @@ Perl_functions (FILE *inf)
             cp++;
           if (cp == sp)
             continue;           /* nothing found */
-          if ((pos = etags_strchr (sp, ':')) != NULL
+          if ((pos = strchr (sp, ':')) != NULL
               && pos < cp && pos[1] == ':')
             /* The name is already qualified. */
             make_tag (sp, cp - sp, true,
@@ -5029,7 +5027,7 @@ TEX_decode_env (const char *evarname, const char *defenv)
 
   /* Allocate a token table */
   for (len = 1, p = env; p;)
-    if ((p = etags_strchr (p, ':')) && *++p != '\0')
+    if ((p = strchr (p, ':')) && *++p != '\0')
       len++;
   TEX_toktab = xnew (len, linebuffer);
 
@@ -5037,7 +5035,7 @@ TEX_decode_env (const char *evarname, const char *defenv)
   /* zero-length strings (leading ':', "::" and trailing ':') */
   for (i = 0; *env != '\0';)
     {
-      p = etags_strchr (env, ':');
+      p = strchr (env, ':');
       if (!p)                   /* End of environment string. */
         p = env + strlen (env);
       if (p - env > 0)
@@ -5575,7 +5573,7 @@ scan_separators (char *name)
 /* Look at the argument of --regex or --no-regex and do the right
    thing.  Same for each line of a regexp file. */
 static void
-analyse_regex (char *regex_arg)
+analyze_regex (char *regex_arg)
 {
   if (regex_arg == NULL)
     {
@@ -5606,7 +5604,7 @@ analyse_regex (char *regex_arg)
           pfatal (regexfile);
         linebuffer_init (&regexbuf);
         while (readline_internal (&regexbuf, regexfp) > 0)
-          analyse_regex (regexbuf.buffer);
+          analyze_regex (regexbuf.buffer);
         free (regexbuf.buffer);
         fclose (regexfp);
       }
@@ -5767,9 +5765,9 @@ substitute (char *in, char *out, struct re_registers *regs)
   /* Pass 1: figure out how much to allocate by finding all \N strings. */
   if (out[size - 1] == '\\')
     fatal ("pattern error in \"%s\"", out);
-  for (t = etags_strchr (out, '\\');
+  for (t = strchr (out, '\\');
        t != NULL;
-       t = etags_strchr (t + 2, '\\'))
+       t = strchr (t + 2, '\\'))
     if (ISDIGIT (t[1]))
       {
         dig = t[1] - '0';
@@ -6051,7 +6049,7 @@ readline (linebuffer *lbp, FILE *stream)
             {
               char *endp = lbp->buffer + start;
 
-              while ((endp = etags_strchr (endp, '"')) != NULL
+              while ((endp = strchr (endp, '"')) != NULL
                      && endp[-1] == '\\')
                 endp++;
               if (endp != NULL)
@@ -6236,43 +6234,6 @@ savenstr (const char *cp, int len)
   return memcpy (dp, cp, len);
 }
 
-/*
- * Return the ptr in sp at which the character c last
- * appears; NULL if not found
- *
- * Identical to POSIX strrchr, included for portability.
- */
-static char *
-etags_strrchr (register const char *sp, register int c)
-{
-  register const char *r;
-
-  r = NULL;
-  do
-    {
-      if (*sp == c)
-        r = sp;
-  } while (*sp++);
-  return (char *)r;
-}
-
-/*
- * Return the ptr in sp at which the character c first
- * appears; NULL if not found
- *
- * Identical to POSIX strchr, included for portability.
- */
-static char *
-etags_strchr (register const char *sp, register int c)
-{
-  do
-    {
-      if (*sp == c)
-        return (char *)sp;
-    } while (*sp++);
-  return NULL;
-}
-
 /* Skip spaces (end of string is not space), return new pointer. */
 static char *
 skip_spaces (char *cp)
@@ -6398,7 +6359,7 @@ relative_filename (char *file, char *dir)
 
   /* Build a sequence of "../" strings for the resulting relative file name. */
   i = 0;
-  while ((dp = etags_strchr (dp + 1, '/')) != NULL)
+  while ((dp = strchr (dp + 1, '/')) != NULL)
     i += 1;
   res = xnew (3*i + strlen (fp + 1) + 1, char);
   res[0] = '\0';
@@ -6431,7 +6392,7 @@ absolute_filename (char *file, char *dir)
     res = concat (dir, file, "");
 
   /* Delete the "/dirname/.." and "/." substrings. */
-  slashp = etags_strchr (res, '/');
+  slashp = strchr (res, '/');
   while (slashp != NULL && slashp[0] != '\0')
     {
       if (slashp[1] == '.')
@@ -6463,7 +6424,7 @@ absolute_filename (char *file, char *dir)
             }
         }
 
-      slashp = etags_strchr (slashp + 1, '/');
+      slashp = strchr (slashp + 1, '/');
     }
 
   if (res[0] == '\0')           /* just a safety net: should never happen */
@@ -6484,7 +6445,7 @@ absolute_dirname (char *file, char *dir)
   char *slashp, *res;
   char save;
 
-  slashp = etags_strrchr (file, '/');
+  slashp = strrchr (file, '/');
   if (slashp == NULL)
     return savestr (dir);
   save = slashp[1];
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
deleted file mode 100755
index ab8c5e38618..00000000000
--- a/lib-src/grep-changelog
+++ /dev/null
@@ -1,265 +0,0 @@
-#! /usr/bin/perl
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# Extract entries from ChangeLogs matching specified criteria.
-# Optionally format the resulting output to a form suitable for RCS
-# logs, like they are used in Emacs, for example.  In this format,
-# author lines, leading spaces, and file names are removed.
-
-require 5;
-use strict;
-
-# Parse command line options.
-
-use vars qw($author $regexp $exclude $from_date $to_date
-            $rcs_log $with_date $version $help $reverse
-            @entries);
-
-use Getopt::Long;
-
-my $result;
-
-if (@ARGV == 0) {
-
-    # No arguments cannot possibly mean "show everything"!!
-    $result = 0;
-
-} else {
-
-    $result = GetOptions ("author=s" => \$author,
-                          "text=s"  => \$regexp,
-                          "exclude=s"  => \$exclude,
-                          "from-date=s" => \$from_date,
-                          "to-date=s" => \$to_date,
-                          "rcs-log" => \$rcs_log,
-                          "with-date" => \$with_date,
-                          "reverse!" => \$reverse,
-                          "version" => \$version,
-                          "help"    => \$help);
-
-    # If date options are specified, check that they have the format
-    # YYYY-MM-DD.
-
-    $result = 0 if $from_date && $from_date !~ /^\d\d\d\d-\d\d-\d\d$/;
-    $result = 0 if $to_date && $to_date !~ /^\d\d\d\d-\d\d-\d\d$/;
-}
-
-# Print usage information and exit when necessary.
-
-if ($result == 0 || $help) {
-    print <<USAGE;
-
-Usage: $0 [options] [CHANGELOG...]
-
-Print entries in ChangeLogs matching various criteria.
-Valid options are:
-
-  --author=AUTHOR         Match entries whose author line matches
-                          regular expression AUTHOR
-  --text=TEXT             Match entries whose text matches regular
-                          expression TEXT
-  --exclude=TEXT          Exclude entries matching TEXT
-  --from-date=YYYY-MM-DD  Match entries not older than given date
-  --to-date=YYYY-MM-DD    Match entries not younger than given date
-  --rcs-log               Format output suitable for RCS log entries
-  --with-date             Print short date line in RCS log
-  --reverse               Show entries in reverse (chronological) order
-  --version               Print version info
-  --help                  Print this help
-
-If no CHANGELOG is specified scan the files "ChangeLog" and
-"ChangeLog.N+" in the current directory.  Old-style dates in ChangeLogs
-are not recognized.
-USAGE
-    exit !$help;
-}
-
-# Print version info and exit if `--version' was specified.
-
-if ($version) {
-    print "0.3\n";
-    exit 0;
-}
-
-
-# Value is non-zero if HEADER matches according to command line
-# options specified, i.e. it matches $author, and its date is in
-# the range $from_date <= date <= $to_date.
-
-sub header_match_p {
-    my $header = shift;
-
-    return 0 unless $header;
-
-    # No match if AUTHOR-regexp specified and doesn't match.
-    return 0 if $author && $header !~ /$author/;
-
-    # Check that the date of the entry matches if date options
-    # `--from-date' and/or `--to-date' were specified .  Old-style
-    # dates in ChangeLogs are not recognized, and never match.
-    if ($from_date || $to_date) {
-        if ($header =~ /^(\d\d\d\d-\d\d-\d\d)/) {
-            my $date = $1;
-            return 0 if $from_date && $date lt $from_date;
-            return 0 if $to_date && $date gt $to_date;
-        } else {
-            # Don't bother recognizing old-style dates.
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-
-# Value is non-zero if ENTRY matches the criteria specified on the
-# command line, i.e. it matches $regexp, and it doesn't match
-# $exclude.
-
-sub entry_match_p {
-    my $entry = shift;
-
-    return 0 unless $entry;
-
-    if ($regexp) {
-        return 1 if ($entry =~ /$regexp/
-                     && (!$exclude || $entry !~ $exclude));
-    } else {
-        return 1 if !$exclude || $entry !~ $exclude;
-    }
-
-    return 0;
-}
-
-
-# Print HEADER and/or ENTRY in a format suitable for what was
-# specified on the command line.  If $rcs_log is specified, author
-# lines are not printed, and leading spaces and file names are removed
-# from ChangeLog entries.
-
-sub print_log {
-    my ($header, $entry) = @_;
-    my $output = '';
-
-    if ($rcs_log) {
-        # Remove leading whitespace from entry.
-        $entry =~ s/^\s+//mg;
-        # Remove file name parts.
-        $entry =~ s/^\*.*\(/(/mg;
-        # Remove file name parts, 2.
-        $entry =~ s/^\*.*://mg;
-        if ($with_date) {
-            $header =~ /(\d\d\d\d-\d\d-\d\d)/;
-            $output = "!changelog-date $1\n";
-        }
-        $output .= $entry;
-    } else {
-        $output .= $header . $entry;
-    }
-
-    if ($reverse) {
-        push @entries, $output;
-    } else {
-        print $output;
-    }
-}
-
-# Scan LOG for matching entries, and print them to standard output.
-
-sub parse_changelog {
-    my $log = shift;
-    my $entry = undef;
-    my $header = undef;
-
-    @entries = () if $reverse;
-
-    # Open the ChangeLog.
-    open (IN, "< $log") || die "Cannot open $log: $!";
-
-    while (defined(my $line = <IN>)) {
-        if ($line =~ /^\S/) {
-            # Line is an author-line.  Print previous entry if
-            # it matches.
-            print_log ($header, $entry)
-                if header_match_p ($header) && entry_match_p ($entry);
-
-            $entry = "";
-            $header = $line;
-
-            # Add empty lines below the header.
-            while (defined($line = <IN>) && $line =~ /^\s*$/) {
-                $header = "$header$line";
-            }
-        }
-
-        last unless defined $line;
-
-        if ($line =~ /^\s*\*/) {
-            # LINE is the first line of a ChangeLog entry.  Print
-            # previous entry if it matches.
-            print_log ($header, $entry)
-                if header_match_p ($header) && entry_match_p ($entry);
-            $entry = $line;
-        } else {
-            # Add LINE to the current entry.
-            $entry = "$entry$line";
-        }
-    }
-
-    # Print last entry if it matches.
-    print_log ($header, $entry)
-        if header_match_p ($header) && entry_match_p ($entry);
-
-    close IN;
-
-    if ($reverse) {
-        for (my $entry = @entries; $entry; $entry--) {
-            print $entries[$entry-1];
-        }
-    }
-}
-
-
-# Main program.  Process ChangeLogs.
-
-# If files were specified on the command line, parse those files in the
-# order supplied by the user; otherwise parse default files ChangeLog and
-# ChangeLog.NNN according to $reverse.
-unless (@ARGV > 0) {
-    @ARGV = ("ChangeLog");
-
-    push @ARGV,
-      map {"ChangeLog.$_"}
-        sort {$b <=> $a}
-          map {/\.(\d+)$/; $1}
-            do {
-                opendir D, '.';
-                grep /^ChangeLog\.\d+$/, readdir D;
-            };
-
-    @ARGV = reverse @ARGV if $reverse;
-}
-
-while (defined (my $log = shift @ARGV)) {
-    parse_changelog ($log) if -f $log;
-}
-
-
-# grep-changelog ends here.
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index c600fc0ea53..b0196b309d8 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -714,8 +714,8 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
 
   for (i = start; i * increment <= end * increment; i += increment)
     {
-      mbx_delimit_begin (mbf);
-      if (pop_retr (server, i, mbf) != OK)
+      if (mbx_delimit_begin (mbf) != OK
+          || pop_retr (server, i, mbf) != OK)
         {
           error ("%s", Errmsg, 0);
           close (mbfi);
@@ -832,15 +832,15 @@ mbx_write (char *line, int len, FILE *mbf)
 static int
 mbx_delimit_begin (FILE *mbf)
 {
-  time_t now;
-  struct tm *ltime;
-  char fromline[40] = "From movemail ";
-
-  now = time (NULL);
-  ltime = localtime (&now);
-
-  strcat (fromline, asctime (ltime));
-
+  time_t now = time (NULL);
+  struct tm *ltime = localtime (&now);
+  if (!ltime)
+    return NOTOK;
+
+  char fromline[100];
+  if (! strftime (fromline, sizeof fromline,
+                  "From movemail %a %b %e %T %Y\n", ltime))
+    return NOTOK;
   if (fputs (fromline, mbf) == EOF)
     return (NOTOK);
   return (OK);