- quilt/mail.in: Remove stray getopt line. If --subject is given,

  actually fill in the subject in the message template.

6 files changed, 81 insertions, 54 deletions

diff --git a/po/de.po b/po/de.po
index 4cf7bad..8999b30 100644
--- a/po/de.po
+++ b/po/de.po
@@ -82,16 +82,16 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n"
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
-#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
-#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
-#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
-#: quilt/unapplied.in:62
+#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
+#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:246 quilt/previous.in:62
+#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
+#: quilt/rename.in:63 quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei enthalten\\n"
 
-#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
-#: quilt/refresh.in:154 quilt/remove.in:74
+#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/pop.in:261 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
@@ -123,14 +123,20 @@ msgid "File %s added to patch %s\\n"
 msgstr "Datei %s zu Patch %s hinzugefügt\\n"
 
 #: quilt/annotate.in:22
-msgid "Usage: quilt annotate {file}\\n"
+#, fuzzy
+msgid "Usage: quilt [-p patch] annotate {file}\\n"
 msgstr "Verwendung: quilt annotate {datei}\\n"
 
 #: quilt/annotate.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
-"patches modify which lines.\n"
+"patches modify which lines. Only applied patches are included.\n"
+"\n"
+"-p patch\n"
+"\tStop checking for changes at the specified rather than the\n"
+"\ttopmost patch.\n"
 msgstr ""
 "\n"
 "Erzeuge ein Listing der angegebenen Datei das anzeigt, welche\n"
@@ -346,11 +352,11 @@ msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "Später angewandte Patches verändern Dateien von %s\\n"
 
-#: quilt/edit.in:13
+#: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
 msgstr "Verwendung: quilt edit datei ...\\n"
 
-#: quilt/edit.in:16
+#: quilt/edit.in:27
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
@@ -1368,7 +1374,7 @@ msgstr "Datei %s ist verschwunden\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
 
-#: scripts/patchfns.in:733
+#: scripts/patchfns.in:727
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1381,7 +1387,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: scripts/patchfns.in:810
+#: scripts/patchfns.in:812
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/fr.po b/po/fr.po
index 6f7c734..fc353c5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -82,16 +82,16 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Le fichier %s est situé en dessous de %s\\n"
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
-#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
-#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
-#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
-#: quilt/unapplied.in:62
+#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
+#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:246 quilt/previous.in:62
+#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
+#: quilt/rename.in:63 quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la série\\n"
 
-#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
-#: quilt/refresh.in:154 quilt/remove.in:74
+#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/pop.in:261 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
@@ -123,14 +123,20 @@ msgid "File %s added to patch %s\\n"
 msgstr "Le fichier %s a été ajouté au patch %s\\n"
 
 #: quilt/annotate.in:22
-msgid "Usage: quilt annotate {file}\\n"
+#, fuzzy
+msgid "Usage: quilt [-p patch] annotate {file}\\n"
 msgstr "Usage : quilt annotate {fichier}\\n"
 
 #: quilt/annotate.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
-"patches modify which lines.\n"
+"patches modify which lines. Only applied patches are included.\n"
+"\n"
+"-p patch\n"
+"\tStop checking for changes at the specified rather than the\n"
+"\ttopmost patch.\n"
 msgstr ""
 "\n"
 "Affiche une version annotée du fichier spécifié, montrant quel\n"
@@ -348,11 +354,11 @@ msgstr "Le diff a échoué. Abandon.\\n"
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "Un patch plus recent modifie des fichiers communs à %s.\\n"
 
-#: quilt/edit.in:13
+#: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
 msgstr "Usage : quilt edit {fichier} ...\\n"
 
-#: quilt/edit.in:16
+#: quilt/edit.in:27
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
@@ -1384,7 +1390,7 @@ msgstr "Le fichier %s a disparu !\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "Impossible de renommer %s en %s : %s\n"
 
-#: scripts/patchfns.in:733
+#: scripts/patchfns.in:727
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1396,7 +1402,7 @@ msgstr ""
 "format %s (inclus). Veuillez retirer vos patches avec la version \n"
 "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n"
 
-#: scripts/patchfns.in:810
+#: scripts/patchfns.in:812
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/ja.po b/po/ja.po
index 59b0a9a..4b72700 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -80,16 +80,16 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "ファイル \\`%s'��\\`%s'以下��り��\\n"
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
-#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
-#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
-#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
-#: quilt/unapplied.in:62
+#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
+#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:246 quilt/previous.in:62
+#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
+#: quilt/rename.in:63 quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "パッ� %s � series�中��り��ん\\n"
 
-#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
-#: quilt/refresh.in:154 quilt/remove.in:74
+#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/pop.in:261 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "パッ� %s ��用�れ����ん\\n"
 
@@ -121,14 +121,20 @@ msgid "File %s added to patch %s\\n"
 msgstr "ファイル %s をパッ� %s �追加����\\n"
 
 #: quilt/annotate.in:22
-msgid "Usage: quilt annotate {file}\\n"
+#, fuzzy
+msgid "Usage: quilt [-p patch] annotate {file}\\n"
 msgstr "使�方: quilt annotate {ファイル}\\n"
 
 #: quilt/annotate.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
-"patches modify which lines.\n"
+"patches modify which lines. Only applied patches are included.\n"
+"\n"
+"-p patch\n"
+"\tStop checking for changes at the specified rather than the\n"
+"\ttopmost patch.\n"
 msgstr ""
 "\n"
 "指定�れ�ファイルを���パッ����行を変更������註釈付��出力��"
@@ -342,11 +348,11 @@ msgstr "差分�失敗����。異常終了���\\n"
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "最近�パッ���パッ� %s 内�ファイルを変更�����\\n"
 
-#: quilt/edit.in:13
+#: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
 msgstr "使�方: quilt edit ファイル ...\\n"
 
-#: quilt/edit.in:16
+#: quilt/edit.in:27
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
@@ -1345,7 +1351,7 @@ msgstr "ファイル %s �消����!\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "パッ� %s �ら %s�����変更�失敗����: %s\n"
 
-#: scripts/patchfns.in:733
+#: scripts/patchfns.in:727
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1357,7 +1363,7 @@ msgstr ""
 "����ん。ダウングレード�る���push���ージョン� quiltを使���\n"
 "����パッ�を pop ������。\\n"
 
-#: scripts/patchfns.in:810
+#: scripts/patchfns.in:812
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 4a7fc1f..ee730e5 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -46,16 +46,16 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr ""
 
-#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:109 quilt/diff.in:160
-#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
-#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
-#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
-#: quilt/unapplied.in:62
+#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
+#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:246 quilt/previous.in:62
+#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
+#: quilt/rename.in:63 quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
-#: quilt/refresh.in:154 quilt/remove.in:74
+#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/pop.in:261 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
@@ -87,14 +87,18 @@ msgid "File %s added to patch %s\\n"
 msgstr ""
 
 #: quilt/annotate.in:22
-msgid "Usage: quilt annotate {file}\\n"
+msgid "Usage: quilt [-p patch] annotate {file}\\n"
 msgstr ""
 
 #: quilt/annotate.in:25
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
-"patches modify which lines.\n"
+"patches modify which lines. Only applied patches are included.\n"
+"\n"
+"-p patch\n"
+"\tStop checking for changes at the specified rather than the\n"
+"\ttopmost patch.\n"
 msgstr ""
 
 #: quilt/applied.in:22
@@ -244,11 +248,11 @@ msgstr ""
 msgid "More recent patches modify files in patch %s\\n"
 msgstr ""
 
-#: quilt/edit.in:13
+#: quilt/edit.in:24
 msgid "Usage: quilt edit file ...\\n"
 msgstr ""
 
-#: quilt/edit.in:16
+#: quilt/edit.in:27
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
@@ -965,7 +969,7 @@ msgstr ""
 msgid "Failed to rename %s to %s: %s\n"
 msgstr ""
 
-#: scripts/patchfns.in:733
+#: scripts/patchfns.in:727
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -973,7 +977,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: scripts/patchfns.in:810
+#: scripts/patchfns.in:812
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/quilt.changes b/quilt.changes
index e127ab5..a3b70da 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Sep 15 01:51:20 CEST 2005 - agruen@suse.de
+
+- quilt/mail.in: Remove stray getopt line. If --subject is given,
+  actually fill in the subject in the message template.
+
+-------------------------------------------------------------------
 Wed Sep 14 22:52:23 CEST 2005 - khali@linux-fr.org
 
 - Makefile.in: Use @BASH@ instead of bash (John Vandenberg).
diff --git a/quilt/mail.in b/quilt/mail.in
index 75023a3..ccd72f0 100644
--- a/quilt/mail.in
+++ b/quilt/mail.in
@@ -19,7 +19,6 @@ then
 	. @SCRIPTS@/patchfns
 fi
 
-options=`getopt -o o:h --long from:,to:,cc:,bcc:,subject:,send,mbox -- "$@"`
 usage()
 {
 	printf $"Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\n"
@@ -160,7 +159,7 @@ introduction=$(gen_tempfile)
 	Cc: $(IFS=,; echo "${opt_cc[*]}")
 	Bcc: $(IFS=,; echo "${opt_bcc[*]}")
 	Subject-Prefix: [patch @num@/@total@]
-	Subject: 
+	Subject: $opt_subject
 
 	--
 	EOF