6 files changed, 34 insertions, 278 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ff631d09fcd..68a8c37c2fb 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,31 @@
+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)
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f1ad84f4d44..2df22d9f7d8 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -117,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.
@@ -129,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}
@@ -181,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:
@@ -281,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/make-docfile.c b/lib-src/make-docfile.c
index 1314a7b6829..4f68fdb78c9 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1025,7 +1025,7 @@ 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 >= 0)
+  while (c != '\n' && c != '\r' && c != EOF)
     {
       c2 = c1;
       c1 = c;
@@ -1040,6 +1040,8 @@ search_lisp_doc_at_eol (FILE *infile)
       fprintf (stderr, "## non-docstring in %s (%s)\n",
                buffer, filename);
 #endif
+      if (c != EOF)
+        ungetc (c, infile);
       return 0;
     }
   return 1;
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index b727288351a..fea1d29592e 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -387,25 +387,13 @@ $(BLD)/etags.$(O) : \
         $(SRC)/ntlib.h \
         $(EMACS_ROOT)/lib/getopt.h
 
-$(BLD)/getdate.$(O) : \
-        $(SRC)/getdate.c \
-        $(EMACS_ROOT)/src/s/ms-w32.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 \
@@ -435,20 +423,12 @@ $(BLD)/profile.$(O) : \
         $(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)/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
-