Merge from trunk

7 files changed, 159 insertions, 436 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a4a1cffaa96..68a8c37c2fb 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,72 @@
+2012-06-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-docfile.c (search_lisp_doc_at_eol): Unget last read
+        character.
+
+2012-06-06  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPTS, insrcdir)
+        (stamp-rcs2log, stamp-grep-changelog): Remove.
+        (all, clean): Remove references to stamps.
+
+        * vcdiff: Remove file.
+        * Makefile.in (SCRIPTS, STAMP_SCRIPTS): Remove vcdiff.
+        (stamp-vcdiff): Remove.
+
+2012-06-05  Glenn Morris  <rgm@gnu.org>
+
+        * makefile.w32-in ($(BLD)/getdate.$(O), $(BLD)/leditcfns.$(O)):
+        ($(BLD)/make-path.$(O), $(BLD)/qsort.$(O)):
+        ($(BLD)/timer.$(O)): Remove cruft.
+
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+        * rcs-checkin: Remove file.
+        * Makefile.in (INSTALLABLE_SCRIPTS, STAMP_INST_SCRIPTS):
+        Remove rcs-checkin.
+        (stamp-rcs-checkin): Remove.
+
+2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
+        instead of a literal -mwindows, which is not supported by MSVC.
+        (Bug#11405)
+
+2012-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * make-docfile.c: Improve comment style.
+        (search_lisp_doc_at_eol): New function.
+        (scan_lisp_file): Use it.
+
+2012-05-26  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (INSTALL_DATA): Remove; unused.
+
+2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove src/m/*.
+        * makefile.w32-in: Remove dependencies on
+        $(EMACS_ROOT)/src/m/intel386.h.
+
+2012-05-22  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install): Remove unneeded chmods.
+
+2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume C89 or later.
+        * etags.c (static, const): Remove macros.
+        (PTR): Remove; all uses replaced with void *.  Omit needless casts.
+
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
+        Scrap superfluous subshells.
+
+2012-05-18  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install): Ensure $bindir exists.
+
 2012-05-17  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (ns_appbindir): New, set by configure.
@@ -412,8 +481,8 @@
 
         * etags.c (canonicalize_filename, ISUPPER): Fix last change.
 
-        * makefile.w32-in ($(BLD)/ebrowse.$(O), $(BLD)/pop.$(O)): Depend
-        on ../lib/min-max.h.
+        * makefile.w32-in ($(BLD)/ebrowse.$(O), $(BLD)/pop.$(O)):
+        Depend on ../lib/min-max.h.
 
 2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -2790,7 +2859,7 @@
 
         * make-docfile.c (read_c_string_or_comment): Declare msgno.
 
-        * Makefile.in (YACC): Deleted.
+        * Makefile.in (YACC): Delete.
 
 2002-10-19  Andreas Schwab  <schwab@suse.de>
 
@@ -3008,7 +3077,7 @@
         (TeX_commands): Names now include the initial backslash.
         (TeX_commands): Names do not include numeric args #n.
         (TeX_commands): Correct line char number in tags.
-        (TEX_tabent, TEX_token): Deleted.
+        (TEX_tabent, TEX_token): Delete.
         (TeX_commands, TEX_decode_env): Streamlined.
 
 2002-06-05  Francesco Potortì  <pot@gnu.org>
@@ -3049,7 +3118,7 @@
         (main): New argument -d, for specifying directory.
         (usage): Document.
         (get_user_id): Compute.
-        (get_home_dir): Deleted.
+        (get_home_dir): Delete.
         (get_prefix): New function, taken from main.
         (main): Check whether or not we are running setuid.  Move prefix
         computation to get_prefix.  Don't call getpwent; we don't need to
@@ -3310,7 +3379,7 @@
         (LOOKING_AT, get_tag, PHP_functions): Use notinname.
         (Ada_getit, Ada_funcs, Python_functions, Scheme_functions):
         Clarified, using strneq or notinname.
-        (L_isdef, L_isquote): Removed.
+        (L_isdef, L_isquote): Remove.
         (Lisp_functions, L_getit): Clarified.
 
         * etags.c (P_): Rename to __P for consistency with config.h.
@@ -3747,7 +3816,7 @@
         comma when --declarations is used.
         (C_entries): More accurate tagging of members and declarations.
         (yacc_rules): Was global, made local to C_entries.
-        (next_token_is_func): Removed.
+        (next_token_is_func): Remove.
         (fvdef): New constants fdefunkey, fdefunname.
         (consider_token, C_entries): Use them.
         (C_entries): Build proper lisp names for Emacs DEFUNs.
@@ -4223,7 +4292,7 @@
         (find_entries, takeprec, getit, Fortran_functions, Perl_functions)
         (Python_functions, L_getit, Lisp_functions, Scheme_functions)
         (prolog_pred, erlanf_func, erlang_attribute): Use them.
-        (eat_white): Deleted.
+        (eat_white): Delete.
 
         * etags.c (CHAR, init): Keep into account non US-ASCII
         characters and compilers with default signed chars.
@@ -4746,7 +4815,7 @@
 1997-05-13  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
         * etags.c (TeX_functions): Cleaned up.
-        (tex_getit): Removed.
+        (tex_getit): Remove.
 
 1997-05-13  Paul Eggert  <eggert@twinsun.com>
 
@@ -5267,7 +5336,7 @@
 
         * etags.c: Prolog language totally rewritten.
         (Prolog_functions): Rewritten from scratch.
-        (skip_comment, prolog_getit): Removed.
+        (skip_comment, prolog_getit): Remove.
         (prolog_skip_comment): New function, like old skip_comment.
         (prolog_pred, prolog_atom, prolog_white): New functions.
         (erlang_func, erlang_attributes): Forward declarations added.
@@ -5768,7 +5837,7 @@
 
 1995-01-12  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (FILEPOS, GET_CHARNO, GET_FILEPOS, max, LINENO): Deleted.
+        * etags.c (FILEPOS, GET_CHARNO, GET_FILEPOS, max, LINENO): Delete.
         (append_to_tagfile, typedefs, typedefs_and_cplusplus)
         (constantypedefs, update, vgrind_style, no_warnings)
         (cxref_style, cplusplus, noindentypedefs): Were int, now logical.
@@ -5787,9 +5856,9 @@
         (consider_token): Don't take a token as argument.  Use savenstr
         when saving a tag in structtag.  Callers changed.
         (TOKEN): Structure changed.  Now used only in C_entries.
-        (TOKEN_SAVED_P, SAVE_TOKEN, RESTORE_TOKEN): Deleted.
+        (TOKEN_SAVED_P, SAVE_TOKEN, RESTORE_TOKEN): Delete.
         (C_entries): nameb and savenameb deleted.  Use dinamic allocation.
-        (pfcnt): Deleted.  Users updated.
+        (pfcnt): Delete.  Users updated.
         (getit, Asm_labels, Pascal_functions, L_getit, get_scheme)
         (TEX_getit, prolog_getit): Use dinamic allocation for storing
         the tag instead of a fixed size buffer.
@@ -6365,7 +6434,7 @@
 
 1994-03-25  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (emacs_tags_format, ETAGS): Removed.  Use CTAGS instead.
+        * etags.c (emacs_tags_format, ETAGS): Remove.  Use CTAGS instead.
         (main): Don't allow the use of -t and -T in etags mode.
         (print_help): Don't show options enabled by default.
         (print_version): Show the emacs version number if VERSION is #defined.
@@ -6482,9 +6551,9 @@
 1994-01-14  Francesco Potortì  (pot@cnuce.cnr.it)
 
         * etags.c (stab_entry, stab_create, stab_find, stab_search,
-        stab_type, add_keyword, C_reate_stab, C_create_stabs): Deleted.
+        stab_type, add_keyword, C_reate_stab, C_create_stabs): Delete.
         Use gperf generated hash table instead of linked list.
-        (C_stab_entry, hash, in_word_set, get_C_stab, C_symtype): Added.
+        (C_stab_entry, hash, in_word_set, get_C_stab, C_symtype): Add.
         Mostly code generated by gperf.
         (consider_token): Remove unused parameter `lp'.
         (PF_funcs, getit): Allow subroutine and similar declarations
@@ -6803,7 +6872,7 @@
         * etags.c (consider_token): Was `==', now is `='.
         (consider_token): DEFUNs now treated like funcs in ctags mode.
 
-        * etags.c (LEVEL_OK_FOR_FUNCDEF): Removed.
+        * etags.c (LEVEL_OK_FOR_FUNCDEF): Remove.
         (C_entries): Optimized 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
@@ -7102,10 +7171,10 @@
         * etags.c (GET_COOKIE): And related macros removed.
         (logical): Is now int, no more a char.
         (reg): Define deleted.
-        (isgood, _gd, notgd): Deleted.
-        (gotone): Deleted.
+        (isgood, _gd, notgd): Delete.
+        (gotone): Delete.
         (TOKEN): Member linestart removed.
-        (linepos, prev_linepos, lb1): Deleted.
+        (linepos, prev_linepos, lb1): Delete.
         (main): Call initbuffer on lbs array instead of lb1.
         (init): Remove the initialization of the logical _gd array.
         (find_entries): A .sa suffix means assembler file.
@@ -7113,7 +7182,7 @@
         All C state machines rewritten.
         (C_entries): Complete rewrite.
         (condider_token): Complete rewrite.
-        (getline): Deleted.
+        (getline): Delete.
 
 1993-03-01  Francesco Potortì  (pot@fly.CNUCE.CNR.IT)
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1306e660630..2df22d9f7d8 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -106,7 +106,6 @@ gameuser=@gameuser@
 # ../configure figures out the correct values for these.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
@@ -118,8 +117,7 @@ MKDIR_P = @MKDIR_P@
 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
                ebrowse${EXEEXT}
 
-INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
-STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
+INSTALLABLE_SCRIPTS = grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
@@ -130,8 +128,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
-SCRIPTS= rcs2log vcdiff
-STAMP_SCRIPTS= stamp-rcs2log stamp-vcdiff
+SCRIPTS= rcs2log
 
 # All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
 EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
@@ -182,32 +179,11 @@ ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
-all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
+all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
-## These targets copy the scripts into the build directory so that
-## they can be run from there in an uninstalled Emacs.
-## Nothing to do if pwd = srcdir.
-insrcdir=[ "`/bin/pwd`" = "`(cd $(srcdir) && /bin/pwd)`" ]
-
-stamp-rcs2log: $(srcdir)/rcs2log
-        $(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
-        touch $@
-
-stamp-rcs-checkin: $(srcdir)/rcs-checkin
-        $(insrcdir) || cp -p $(srcdir)/rcs-checkin rcs-checkin
-        touch $@
-
-stamp-grep-changelog: $(srcdir)/grep-changelog
-        $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
-        touch $@
-
-stamp-vcdiff: $(srcdir)/vcdiff
-        $(insrcdir) || cp -p $(srcdir)/vcdiff vcdiff
-        touch $@
-
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
 blessmail:
@@ -237,7 +213,7 @@ $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
         umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir}
-        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` != `/bin/pwd` ]; then \
           for file in ${UTILITIES}; do \
             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
           done ; \
@@ -249,8 +225,8 @@ $(DESTDIR)${archlibdir}: all
           chown ${gameuser} $(DESTDIR)${gamedir}; \
           chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
         fi
-        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
-             != `(cd ${srcdir} && /bin/pwd)` ]; then \
+        if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \
+             != `cd ${srcdir} && /bin/pwd` ]; then \
           for file in ${SCRIPTS}; do \
             $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
           done ; \
@@ -259,13 +235,12 @@ $(DESTDIR)${archlibdir}: all
 install: $(DESTDIR)${archlibdir}
         @echo
         @echo "Installing utilities for users to run."
+        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
         for file in ${INSTALLABLES} ; do \
           $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
-          chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
         done
         for file in ${INSTALLABLE_SCRIPTS} ; do \
           $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
-          chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
         done
 
 uninstall:
@@ -283,7 +258,6 @@ mostlyclean:
 
 clean: mostlyclean
         -rm -f ${EXE_FILES}
-        -rm -f ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 distclean: clean
         -rm -f TAGS
diff --git a/lib-src/etags.c b/lib-src/etags.c
index ccf97a8357f..7d2a5a90999 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -93,22 +93,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
-  /* This is probably not necessary any more.  On some systems, config.h
-     used to define static as nothing for the sake of unexec.  We don't
-     want that here since we don't use unexec.  None of these systems
-     are supported any more, but the idea is still mentioned in
-     etc/PROBLEMS.  */
-# undef static
-# ifndef PTR                    /* for XEmacs */
-#   define PTR void *
-# endif
-#else  /* no config.h */
-# if defined (__STDC__) && (__STDC__ || defined (__SUNPRO_C))
-#   define PTR void *           /* for generic pointers */
-# else /* not standard C */
-#   define const                /* remove const for old compilers' sake */
-#   define PTR long *           /* don't use void* */
-# endif
 #endif /* !HAVE_CONFIG_H */
 
 #ifndef _GNU_SOURCE
@@ -415,8 +399,8 @@ static bool filename_is_absolute (char *f);
 static void canonicalize_filename (char *);
 static void linebuffer_init (linebuffer *);
 static void linebuffer_setlen (linebuffer *, int);
-static PTR xmalloc (size_t);
-static PTR xrealloc (char *, size_t);
+static void *xmalloc (size_t);
+static void *xrealloc (char *, size_t);
 
 
 static char searchar = '/';     /* use /.../ searches */
@@ -6686,19 +6670,19 @@ linebuffer_setlen (linebuffer *lbp, int toksize)
 }
 
 /* Like malloc but get fatal error if memory is exhausted. */
-static PTR
+static void *
 xmalloc (size_t size)
 {
-  PTR result = (PTR) malloc (size);
+  void *result = malloc (size);
   if (result == NULL)
     fatal ("virtual memory exhausted", (char *)NULL);
   return result;
 }
 
-static PTR
+static void *
 xrealloc (char *ptr, size_t size)
 {
-  PTR result = (PTR) realloc (ptr, size);
+  void *result = realloc (ptr, size);
   if (result == NULL)
     fatal ("virtual memory exhausted", (char *)NULL);
   return result;
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index b33b13f34ce..4f68fdb78c9 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -35,7 +35,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
-/* defined to be emacs_main, sys_fopen, etc. in config.h */
+/* Defined to be emacs_main, sys_fopen, etc. in config.h.  */
 #undef main
 #undef fopen
 #undef chdir
@@ -66,7 +66,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
 #endif
 
-/* Use this to suppress gcc's `...may be used before initialized' warnings. */
+/* Use this to suppress gcc's `...may be used before initialized' warnings.  */
 #ifdef lint
 # define IF_LINT(Code) Code
 #else
@@ -226,7 +226,7 @@ put_filename (char *filename)
 
   for (tmp = filename; *tmp; tmp++)
     {
-      if (IS_DIRECTORY_SEP(*tmp))
+      if (IS_DIRECTORY_SEP (*tmp))
         filename = tmp + 1;
     }
 
@@ -675,14 +675,14 @@ scan_c_file (char *filename, const char *mode)
 
   if (infile == NULL && extension == 'o')
     {
-      /* try .m */
+      /* Try .m.  */
       filename[strlen (filename) - 1] = 'm';
       infile = fopen (filename, mode);
       if (infile == NULL)
-        filename[strlen (filename) - 1] = 'c'; /* don't confuse people */
+        filename[strlen (filename) - 1] = 'c'; /* Don't confuse people.  */
     }
 
-  /* No error if non-ex input file */
+  /* No error if non-ex input file.  */
   if (infile == NULL)
     {
       perror (filename);
@@ -800,8 +800,8 @@ scan_c_file (char *filename, const char *mode)
               input_buffer[i++] = c;
               c = getc (infile);
             }
-          while (! (c == ',' || c == ' ' || c == '\t' ||
-                    c == '\n' || c == '\r'));
+          while (! (c == ',' || c == ' ' || c == '\t'
+                    || c == '\n' || c == '\r'));
           input_buffer[i] = '\0';
 
           name = xmalloc (i + 1);
@@ -820,7 +820,7 @@ scan_c_file (char *filename, const char *mode)
         commas = 3;
       else if (defvarflag)
         commas = 1;
-      else  /* For DEFSIMPLE and DEFPRED */
+      else  /* For DEFSIMPLE and DEFPRED.  */
         commas = 2;
 
       while (commas)
@@ -838,9 +838,9 @@ scan_c_file (char *filename, const char *mode)
                   if (c < 0)
                     goto eof;
                   ungetc (c, infile);
-                  if (commas == 2) /* pick up minargs */
+                  if (commas == 2) /* Pick up minargs.  */
                     scanned = fscanf (infile, "%d", &minargs);
-                  else /* pick up maxargs */
+                  else /* Pick up maxargs.  */
                     if (c == 'M' || c == 'U') /* MANY || UNEVALLED */
                       maxargs = -1;
                     else
@@ -893,7 +893,7 @@ scan_c_file (char *filename, const char *mode)
           fprintf (outfile, "%s\n", input_buffer);
 
           if (comment)
-            getc (infile);      /* Skip past `*' */
+            getc (infile);      /* Skip past `*'.  */
           c = read_c_string_or_comment (infile, 1, comment, &saw_usage);
 
           /* If this is a defun, find the arguments and print them.  If
@@ -979,7 +979,7 @@ scan_c_file (char *filename, const char *mode)
  problem because byte-compiler output follows this convention.
  The NAME and DOCSTRING are output.
  NAME is preceded by `F' for a function or `V' for a variable.
- An entry is output only if DOCSTRING has \ newline just after the opening "
+ An entry is output only if DOCSTRING has \ newline just after the opening ".
  */
 
 static void
@@ -1020,6 +1020,34 @@ read_lisp_symbol (FILE *infile, char *buffer)
 }
 
 static int
+search_lisp_doc_at_eol (FILE *infile)
+{
+  char c = 0, c1 = 0, c2 = 0;
+
+  /* Skip until the end of line; remember two previous chars.  */
+  while (c != '\n' && c != '\r' && c != EOF)
+    {
+      c2 = c1;
+      c1 = c;
+      c = getc (infile);
+    }
+
+  /* If two previous characters were " and \,
+     this is a doc string.  Otherwise, there is none.  */
+  if (c2 != '"' || c1 != '\\')
+    {
+#ifdef DEBUG
+      fprintf (stderr, "## non-docstring in %s (%s)\n",
+               buffer, filename);
+#endif
+      if (c != EOF)
+        ungetc (c, infile);
+      return 0;
+    }
+  return 1;
+}
+
+static int
 scan_lisp_file (const char *filename, const char *mode)
 {
   FILE *infile;
@@ -1033,7 +1061,7 @@ scan_lisp_file (const char *filename, const char *mode)
   if (infile == NULL)
     {
       perror (filename);
-      return 0;                         /* No error */
+      return 0;                         /* No error.  */
     }
 
   c = '\n';
@@ -1110,7 +1138,7 @@ scan_lisp_file (const char *filename, const char *mode)
           type = 'F';
           read_lisp_symbol (infile, buffer);
 
-          /* Skip the arguments: either "nil" or a list in parens */
+          /* Skip the arguments: either "nil" or a list in parens.  */
 
           c = getc (infile);
           if (c == 'n') /* nil */
@@ -1154,39 +1182,18 @@ scan_lisp_file (const char *filename, const char *mode)
                || ! strcmp (buffer, "defconst")
                || ! strcmp (buffer, "defcustom"))
         {
-          char c1 = 0, c2 = 0;
           type = 'V';
           read_lisp_symbol (infile, buffer);
 
           if (saved_string == 0)
-            {
-
-              /* Skip until the end of line; remember two previous chars.  */
-              while (c != '\n' && c != '\r' && c >= 0)
-                {
-                  c2 = c1;
-                  c1 = c;
-                  c = getc (infile);
-                }
-
-              /* If two previous characters were " and \,
-                 this is a doc string.  Otherwise, there is none.  */
-              if (c2 != '"' || c1 != '\\')
-                {
-#ifdef DEBUG
-                  fprintf (stderr, "## non-docstring in %s (%s)\n",
-                           buffer, filename);
-#endif
-                  continue;
-                }
-            }
+            if (!search_lisp_doc_at_eol (infile))
+              continue;
         }
 
       else if (! strcmp (buffer, "custom-declare-variable")
                || ! strcmp (buffer, "defvaralias")
                )
         {
-          char c1 = 0, c2 = 0;
           type = 'V';
 
           c = getc (infile);
@@ -1221,31 +1228,12 @@ scan_lisp_file (const char *filename, const char *mode)
             }
 
           if (saved_string == 0)
-            {
-              /* Skip to end of line; remember the two previous chars.  */
-              while (c != '\n' && c != '\r' && c >= 0)
-                {
-                  c2 = c1;
-                  c1 = c;
-                  c = getc (infile);
-                }
-
-              /* If two previous characters were " and \,
-                 this is a doc string.  Otherwise, there is none.  */
-              if (c2 != '"' || c1 != '\\')
-                {
-#ifdef DEBUG
-                  fprintf (stderr, "## non-docstring in %s (%s)\n",
-                           buffer, filename);
-#endif
-                  continue;
-                }
-            }
+            if (!search_lisp_doc_at_eol (infile))
+              continue;
         }
 
       else if (! strcmp (buffer, "fset") || ! strcmp (buffer, "defalias"))
         {
-          char c1 = 0, c2 = 0;
           type = 'F';
 
           c = getc (infile);
@@ -1278,26 +1266,8 @@ scan_lisp_file (const char *filename, const char *mode)
             }
 
           if (saved_string == 0)
-            {
-              /* Skip to end of line; remember the two previous chars.  */
-              while (c != '\n' && c != '\r' && c >= 0)
-                {
-                  c2 = c1;
-                  c1 = c;
-                  c = getc (infile);
-                }
-
-              /* If two previous characters were " and \,
-                 this is a doc string.  Otherwise, there is none.  */
-              if (c2 != '"' || c1 != '\\')
-                {
-#ifdef DEBUG
-                  fprintf (stderr, "## non-docstring in %s (%s)\n",
-                           buffer, filename);
-#endif
-                  continue;
-                }
-            }
+            if (!search_lisp_doc_at_eol (infile))
+              continue;
         }
 
       else if (! strcmp (buffer, "autoload"))
@@ -1339,23 +1309,10 @@ scan_lisp_file (const char *filename, const char *mode)
               continue;
             }
           read_c_string_or_comment (infile, 0, 0, 0);
-          skip_white (infile);
 
           if (saved_string == 0)
-            {
-              /* If the next three characters aren't `dquote bslash newline'
-                 then we're not reading a docstring.  */
-              if ((c = getc (infile)) != '"'
-                  || (c = getc (infile)) != '\\'
-                  || ((c = getc (infile)) != '\n' && c != '\r'))
-                {
-#ifdef DEBUG
-                  fprintf (stderr, "## non-docstring in %s (%s)\n",
-                           buffer, filename);
-#endif
-                  continue;
-                }
-            }
+            if (!search_lisp_doc_at_eol (infile))
+              continue;
         }
 
 #ifdef DEBUG
@@ -1373,12 +1330,10 @@ scan_lisp_file (const char *filename, const char *mode)
           continue;
         }
 
-      /* At this point, we should either use the previous
-         dynamic doc string in saved_string
-         or gobble a doc string from the input file.
-
-         In the latter case, the opening quote (and leading
-         backslash-newline) have already been read.  */
+      /* At this point, we should either use the previous dynamic doc string in
+         saved_string or gobble a doc string from the input file.
+         In the latter case, the opening quote (and leading backslash-newline)
+         have already been read.  */
 
       putc (037, outfile);
       putc (type, outfile);
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 316e4fb127f..fea1d29592e 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -65,7 +65,7 @@ $(BLD)/emacsclient.exe:		$(ECLIENTOBJS)
 
 $(BLD)/emacsclientw.exe:        $(ECLIENTOBJS) $(CLIENTRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-                $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
+                $(LINK) $(LINK_OUT)$@ $(CLIENTRES) $(MWINDOWS) $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
 
 $(BLD)/emacsclient.$(O):        emacsclient.c
                 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
@@ -354,7 +354,6 @@ SRC		= .
 $(BLD)/alloca.$(O) : \
         $(SRC)/alloca.c \
         $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/src/config.h \
         $(EMACS_ROOT)/src/blockinput.h
 
@@ -363,7 +362,6 @@ $(BLD)/ctags.$(O) : \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
         $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(SRC)/ntlib.h \
         $(EMACS_ROOT)/lib/getopt.h
@@ -372,14 +370,12 @@ $(BLD)/ebrowse.$(O) : \
         $(SRC)/ebrowse.c \
         $(EMACS_ROOT)/lib/min-max.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h
 
 $(BLD)/emacsclient.$(O) : \
         $(SRC)/emacsclient.c \
         $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h
 
 $(BLD)/etags.$(O) : \
@@ -387,35 +383,20 @@ $(BLD)/etags.$(O) : \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
         $(EMACS_ROOT)/nt/inc/sys/stat.h \
         $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(SRC)/ntlib.h \
         $(EMACS_ROOT)/lib/getopt.h
 
-$(BLD)/getdate.$(O) : \
-        $(SRC)/getdate.c \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
-        $(EMACS_ROOT)/src/config.h \
-        $(MSTOOLS_SYS)/types.h
-
 $(BLD)/hexl.$(O) : \
         $(SRC)/hexl.c
 
-$(BLD)/leditcfns.$(O) : \
-        $(SRC)/leditcfns.c
-
 $(BLD)/make-docfile.$(O) : \
         $(SRC)/make-docfile.c \
         $(EMACS_ROOT)/src/config.h
 
-$(BLD)/make-path.$(O) : \
-        $(SRC)/make-path.c
-
 $(BLD)/movemail.$(O) : \
         $(SRC)/movemail.c \
         $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(EMACS_ROOT)/nt/inc/sys/file.h \
         $(EMACS_ROOT)/nt/inc/sys/stat.h \
@@ -439,25 +420,15 @@ $(BLD)/pop.$(O) : \
 $(BLD)/profile.$(O) : \
         $(SRC)/profile.c \
         $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h \
         $(EMACS_ROOT)/lib-src/../src/systime.h
 
-$(BLD)/qsort.$(O) : \
-        $(SRC)/qsort.c
-
 $(BLD)/tcp.$(O) : \
         $(SRC)/tcp.c
 
 $(BLD)/test-distrib.$(O) : \
         $(SRC)/test-distrib.c
 
-$(BLD)/timer.$(O) : \
-        $(SRC)/timer.c \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h
-
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
 #
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
deleted file mode 100755
index 57e91becf9d..00000000000
--- a/lib-src/rcs-checkin
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-
-# This script accepts any number of file arguments and checks them into RCS.
-
-# Copyright (C) 1993-1995, 2001-2012 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/>.
-
-
-# Arguments which are detectably either RCS masters (with names ending in ,v)
-# or Emacs version files  (with names of the form foo.~<number>~) are ignored.
-# For each file foo, the script looks for Emacs version files related to it.
-# These files are checked in as deltas, oldest first, so that the contents of
-# the file itself becomes the latest revision in the master.
-#
-# The first line of each file is used as its description text.  The file itself
-# is not deleted, as under VC with vc-keep-workfiles at its default of t, but
-# all the version files are.
-#
-# If an argument file is already version-controlled under RCS, any version
-# files are added to the list of deltas and deleted, and then the workfile
-# is checked in again as the latest version.  This is probably not quite
-# what was wanted, and is the main reason VC doesn't simply call this to
-# do checkins.
-#
-# This script is intended to be used to convert files with an old-Emacs-style
-# version history for use with VC (the Emacs 19 version-control interface),
-# which likes to use RCS as its back end.  It was written by Paul Eggert
-# and revised/documented for use with VC by Eric S. Raymond, Mar 19 1993.
-
-case $# in
-0)
-        echo "rcs-checkin: usage: rcs-checkin file ..."
-        echo "rcs-checkin: function: checks file.~*~ and file into a new RCS file"
-        echo "rcs-checkin: function: uses the file's first line for the description"
-esac
-
-# expr pattern to extract owner from ls -l output
-ls_owner_pattern='[^ ][^ ]*  *[^ ][^ ]*  *\([^ ][^ ]*\)'
-
-for file
-do
-        # Make it easier to say `rcs-checkin *'
-        # by ignoring file names that already contain `~', or end in `,v'.
-        case $file in
-        *~* | *,v) continue
-        esac
-        # Ignore non-files too.
-        test -f "$file" || continue
-
-        # Check that file is readable.
-        test -r "$file" || exit
-
-        # If the RCS file does not already exist,
-        # initialize it with a description from $file's first line.
-        rlog -R "$file" >/dev/null 2>&1 ||
-        rcs -i -q -t-"`sed 1q $file`" "$file" || exit
-
-        # Get list of old files.
-        oldfiles=`
-                ls $file.~[0-9]*~ 2>/dev/null |
-                sort -t~ -n -k 2
-        `
-
-        # Check that they are properly sorted by date.
-        case $oldfiles in
-        ?*)
-                oldfiles_by_date=`ls -rt $file $oldfiles`
-                test " $oldfiles
-$file" = " $oldfiles_by_date" || {
-                        echo >&2 "rcs-checkin: skipping $file, because its mod times are out of order.
-
-Sorted by mod time:
-$oldfiles_by_date
-
-Sorted by name:
-$oldfiles
-$file"
-                        continue
-                }
-        esac
-
-        echo >&2 rcs-checkin: checking in: $oldfiles $file
-
-        # Save $file as $file.~-~ temporarily.
-        mv "$file" "$file.~-~" || exit
-
-        # Rename each old file to $file, and check it in.
-        for oldfile in $oldfiles
-        do
-                mv "$oldfile" "$file" || exit
-                ls_l=`ls -l "$file"` || exit
-                owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner=
-                echo "Formerly ${oldfile}" | ci -d -l -q $owner "$file" || exit
-        done
-
-        # Bring $file back from $file.~-~, and check it in.
-        mv "$file.~-~" "$file" || exit
-        ls_l=`ls -l "$file"` || exit
-        owner=-w`expr " $ls_l" : " $ls_owner_pattern"` || owner=
-        ci -d -q -u $owner -m"entered into RCS" "$file" || exit
-done
-
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
deleted file mode 100755
index dd7ca446d7c..00000000000
--- a/lib-src/vcdiff
+++ /dev/null
@@ -1,114 +0,0 @@
-#! /bin/sh
-
-# Enhanced sccs diff utility for use with vc mode.
-# This version is more compatible with rcsdiff(1).
-
-# Copyright (C) 1992-1993, 1995, 1997, 2001-2012
-#   Free Software Foundation, Inc.
-
-# Author: Paul Eggert
-# (according to authors.el)
-
-# 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/>.
-
-
-DIFF="diff"
-usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
-
-# Now that we use `sccs get' rather than just `get', we don't need this.
-# PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
-
-echo="echo"
-sid1= sid2=
-
-for f
-do
-        case $f in
-        -*)
-                case $f in
-                --brief)
-                        DIFF=cmp;;
-                -q)
-                        echo=:;;
-                -r?*)
-                        case $sid1 in
-                        '')
-                                sid1=$f
-                                ;;
-                        *)
-                                case $sid2 in
-                                ?*) echo "$usage" >&2; exit 2 ;;
-                                esac
-                                sid2=$f
-                                ;;
-                        esac
-                        ;;
-                *)
-                        options="$options $f"
-                        ;;
-                esac
-                shift
-                ;;
-        *)
-                break
-                ;;
-        esac
-done
-
-case $# in
-0)
-        echo "$usage" >&2
-        exit 2
-esac
-
-
-rev1= rev2= status=0
-trap 'status=2; exit' 1 2 13 15
-trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
-
-for f
-do
-        s=2
-
-        case $f in
-        s.* | */s.*)
-                if
-                        rev1=`mktemp /tmp/geta.XXXXXXXX`
-                        sccs get -s -p -k $sid1 "$f" > $rev1 &&
-                        case $sid2 in
-                        '')
-                                workfile=`expr " /$f" : '.*/s.\(.*\)'`
-                                ;;
-                        *)
-                                rev2=`mktemp /tmp/getb.XXXXXXXX`
-                                sccs get -s -p -k $sid2 "$f" > $rev2
-                                workfile=$rev2
-                        esac
-                then
-                        $echo $DIFF $options $rev1 $workfile >&2
-                        $DIFF $options $rev1 $workfile
-                        s=$?
-                fi
-                ;;
-        *)
-                echo "$0: $f is not an SCCS file" >&2
-        esac
-
-        if test $status -lt $s
-        then status=$s
-        fi
-done
-