Merge from trunk

[bpt/emacs.git] / lib-src / rcs-checkin

diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 41b10d2..6861a30 100755 (executable)
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -2,24 +2,23 @@
 
 # This script accepts any number of file arguments and checks them into RCS.
 
-# Copyright (C) 1993, 1994, 1995,2001 Free Software Foundation, Inc.
-#
+# Copyright (C) 1993-1995, 2001-2011 Free Software Foundation, Inc.
+
 # This file is part of GNU Emacs.
-#
-# GNU Emacs is free software; you can redistribute it and/or modify
+
+# 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 2, or (at your option)
-# any later version.
-#
+# 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; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# 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.
@@ -31,7 +30,7 @@
 # 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 
+# 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
@@ -73,7 +72,7 @@ do
        # Get list of old files.
        oldfiles=`
                ls $file.~[0-9]*~ 2>/dev/null |
-               sort -t~ -n +1
+               sort -t~ -n -k 2
        `
 
        # Check that they are properly sorted by date.