From 021836b3da95b9243e9f8386d87d220ab4f7f7b7 Mon Sep 17 00:00:00 2001 From: nion Date: Tue, 5 Apr 2005 16:40:37 +0000 Subject: [PATCH] Nico Golde: - fixed names of temp files - updated patch-notes - fixed translation issue git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@250 e385b8ad-14ed-0310-8656-cc95a2468c6d --- doc/patch-notes.txt | 49 +++++++-------------------------------------- muttlib.c | 2 +- po/de.po | 2 +- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/doc/patch-notes.txt b/doc/patch-notes.txt index d4ceb03..9ed2597 100644 --- a/doc/patch-notes.txt +++ b/doc/patch-notes.txt @@ -1,46 +1,11 @@ -From roessler@does-not-exist.org Wed Nov 7 11:49:56 2001 -Date: Wed, 7 Nov 2001 11:49:56 +0100 -From: Thomas Roessler -To: mutt-dev@mutt.org -Subject: To those shipping patches (v2) -MIME-Version: 1.0 -Content-Type: text/plain; format=flowed -Status: RO -Content-Length: 1273 -Lines: 34 +This document descibes what to do after allplying a patch -You folks have convinced me that the old patchlist was almost the -right way to go for mutt identifying what patches have been applied. +If you want to add patches to Mutt-ng just add the name +of the patch to the PATCHES file after applying the patch. +Mutt-ng recognizes this patch automatically and shows it +in --help e.g. -Thus, I've implemented this scheme (and will commit it to the CVS -in a moment): There's a new file called PATCHES in the source tree, -which will be empty in the official distribution. +Every patch name should have the format: -This file's format is one patch ID per line. Patch IDs should be -the same as the file names used for distributing patches. The -format for these file names should be this: - - patch-... - -That is, Vsevolod's NNTP patch for mutt-1.3.42 could be named like -this: - - patch-1.3.42.vvv.nntp.1 - - From PATCHES, patchlist.c will be automatically generated. In -order to properly construct PATCHES, please include the following -chunk with your patch, replacing by your patch ID. - -------------------------------snip------------------------------ ---- PATCHES~ Tue Nov 6 19:59:33 2001 -+++ PATCHES Tue Nov 6 19:59:42 2001 -@@ -1,0 +1 @@ -+ -------------------------------snip------------------------------ - -The patch IDs will be displayed when mutt is run with the 'v' -command line switch. - --- -Thomas Roessler http://log.does-not-exist.org/ +patch-... diff --git a/muttlib.c b/muttlib.c index 78d7103..94c4987 100644 --- a/muttlib.c +++ b/muttlib.c @@ -648,7 +648,7 @@ void mutt_free_envelope (ENVELOPE ** p) void _mutt_mktemp (char *s, const char *src, int line) { - snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d-%d", NONULL (Tempdir), + snprintf (s, _POSIX_PATH_MAX, "%s/muttng-%s-%d-%d-%d", NONULL (Tempdir), NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++); dprint (1, (debugfile, "%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s)); diff --git a/po/de.po b/po/de.po index 2ed4571..f08f0b4 100644 --- a/po/de.po +++ b/po/de.po @@ -545,7 +545,7 @@ msgstr "Absenden" msgid "Abort" msgstr "Verwerfen" -#: compose.c:94 compose.c:668 +#: compose.c:112 compose.c:124 compose.c:781 msgid "Attach file" msgstr "Datei anhängen" -- 2.20.1