Mercurial > emacs
view lib-src/rcs-checkin @ 65719:5265a4059126
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 125-127)
- Merge from emacs--cvs-trunk--0
- Update from CVS
2005-09-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-uu.el (mm-uu-emacs-sources-regexp): Make variable
customizable. Change default value.
(mm-uu-diff-groups-regexp): Change default value.
(mm-uu-type-alist): Added doc string.
(mm-uu-configure): Added doc string. Make it interactive.
(mm-uu-diff-groups-regexp): Fix missing quotes from previous
commit.
2005-09-27 Simon Josefsson <jas@extundo.com>
* lisp/gnus/message.el (message-idna-to-ascii-rhs-1): Reformat.
2005-09-27 Arne J,Ax(Brgensen <arne@arnested.dk>
* lisp/gnus/message.el (message-remove-duplicates): New function.
Implementation borrowed from `gnus-remove-duplicates'.
(message-idna-to-ascii-rhs): Also encode idna addresses in
Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
(message-idna-to-ascii-rhs-1): When `message-use-idna' is 'ask
only ask about the same idna domain once per header and also tell
in what header to replace the idna domain.
* lisp/gnus/gnus-art.el (article-decode-idna-rhs): Also decode idna
addresses in Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
(article-decode-idna-rhs): Fix regexp so that all idna-address in
a header is decoded and not just the last one.
2005-09-27 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-mime-display-single): Don't modify text if it
has been decoded.
* lisp/gnus/mm-decode.el (mm-insert-part): Don't modify text if it has been
decoded.
* lisp/gnus/mm-view.el (mm-inline-text): Don't strip text props unless
decoding enriched or richtext parts.
2005-09-26 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Server Buffer Format): Document the %a format spec.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 28 Sep 2005 05:26:02 +0000 |
parents | 6358e3c6075c |
children | 3661e9b3c48f 2d92f5c9d6ae |
line wrap: on
line source
#! /bin/sh # This script accepts any number of file arguments and checks them into RCS. # Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, # 2005 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 2, 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., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. # 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 # arch-tag: 89c86949-ef04-4380-838b-bc1444dcb074