Rocco Rutte:

merge in latest mutt changes (incl. #ifdef's for inode sorting)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@238 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/Makefile.am b/Makefile.am
index 8a17ce3..bf0b1ea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,7 +139,7 @@ reldate:
 patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
        $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
 
-install-exec-local:
+install-exec-hook:
        if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then        \
                rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \
                ln -sf $(DESTDIR)$(bindir)/muttng_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \

diff --git a/init.h b/init.h
index cacc906..2d0ad9b 100644 (file)
--- a/init.h
+++ b/init.h
@@ -3706,11 +3706,6 @@ const struct mapping_t SortKeyMethods[] = {
 /* functions used to parse commands in a rc file */
 
 static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-
-#if 0
-static int parse_rx_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-static int parse_rx_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-#endif
 static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 

diff --git a/mh.c b/mh.c
index e88ddb5..7028dbf 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -42,11 +42,17 @@
 #include <string.h>
 #include <utime.h>
 
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 struct maildir {
   HEADER *h;
   char *canon_fname;
   unsigned header_parsed:1;
+#ifdef USE_INODESORT
   ino_t inode;
+#endif /* USE_INODESORT */
   struct maildir *next;
 };
 
@@ -632,7 +638,9 @@ static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
     entry = safe_calloc (sizeof (struct maildir), 1);
     entry->h = h;
     entry->header_parsed = (ctx->magic == M_MH);
+#ifdef USE_INODESORT
     entry->inode = inode;
+#endif /* USE_INODESORT */
     **last = entry;
     *last = &entry->next;
 
@@ -742,6 +750,7 @@ static int maildir_move_to_context (CONTEXT * ctx, struct maildir **md)
   return r;
 }
 
+#ifdef USE_INODESORT
 /*
  * Merge two maildir lists according to the inode numbers.
  */
@@ -818,6 +827,7 @@ static struct maildir *maildir_sort_inode (struct maildir *list)
   right = maildir_sort_inode (right);
   return maildir_merge_inode (left, right);
 }
+#endif /* USE_INODESORT */
 
 #if USE_HCACHE
 static size_t maildir_hcache_keylen (const char *fn)
@@ -925,7 +935,9 @@ int mh_read_dir (CONTEXT * ctx, const char *subdir)
     mhs_free_sequences (&mhs);
   }
 
+#ifdef USE_INODESORT
   md = maildir_sort_inode (md);
+#endif /* USE_INODESORT */
 
   if (ctx->magic == M_MAILDIR)
     maildir_delayed_parsing (ctx, md);

diff --git a/po/de.po b/po/de.po
index 8893333..8b33aaa 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.5.8\n"
+"Project-Id-Version: 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-12 21:58+0100\n"
-"PO-Revision-Date: 2005-02-13 18:28+0100\n"
+"PO-Revision-Date: 2005-03-20 14:03+0100\n"
 "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
 "Language-Team: German <mutt-po@mutt.org>\n"
 "MIME-Version: 1.0\n"
@@ -204,9 +204,8 @@ msgid "Create is only supported for IMAP mailboxes"
 msgstr "Es können nur IMAP Mailboxen erzeugt werden"
 
 #: browser.c:880
-#, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Es können nur IMAP Mailboxen erzeugt werden"
+msgstr "Es können nur IMAP Mailboxen umbenannt werden"
 
 #: browser.c:901
 msgid "Delete is only supported for IMAP mailboxes"
@@ -1400,19 +1399,18 @@ msgid "Mailbox created."
 msgstr "Mailbox erzeugt."
 
 #: imap/browse.c:325
-#, fuzzy, c-format
+#, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Erzeuge Mailbox: "
+msgstr "Benenne Mailbox %s um in: "
 
 #: imap/browse.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "Rename failed: %s"
-msgstr "SSL fehlgeschlagen: %s"
+msgstr "Umbenennung fehlgeschlagen: %s"
 
 #: imap/browse.c:343
-#, fuzzy
 msgid "Mailbox renamed."
-msgstr "Mailbox erzeugt."
+msgstr "Mailbox umbenannt."
 
 #: imap/command.c:294
 msgid "Mailbox closed"
@@ -2325,9 +2323,8 @@ msgid "{internal}"
 msgstr "{intern}"
 
 #: keymap_alldefs.h:151
-#, fuzzy
 msgid "rename the current mailbox (IMAP only)"
-msgstr "Lösche die aktuelle Mailbox (nur für IMAP)"
+msgstr "benenne die aktuelle Mailbox um (nur für IMAP)"
 
 #: keymap_alldefs.h:152
 msgid "reply to a message"

diff --git a/po/id.po b/po/id.po
index 2734ee2..538bef1 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.5.8i\n"
+"Project-Id-Version: 1.5.9i\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-03-13 17:38+0100\n"
-"PO-Revision-Date: 2005-02-14 10:59+0700\n"
+"PO-Revision-Date: 2005-03-21 17:31+1100\n"
 "Last-Translator: Ronny Haryanto <ronny-mutt-po-file@haryan.to>\n"
 "Language-Team: Indonesia <web@linux.or.id>\n"
 "MIME-Version: 1.0\n"
@@ -207,9 +207,8 @@ msgid "Create is only supported for IMAP mailboxes"
 msgstr "Pembuatan hanya didukung untuk kotak surat jenis IMAP."
 
 #: browser.c:880
-#, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Pembuatan hanya didukung untuk kotak surat jenis IMAP."
+msgstr "Penggantian nama hanya didukung untuk kotak surat jenis IMAP."
 
 #: browser.c:901
 msgid "Delete is only supported for IMAP mailboxes"
@@ -1403,19 +1402,18 @@ msgid "Mailbox created."
 msgstr "Kotak surat telah dibuat."
 
 #: imap/browse.c:325
-#, fuzzy, c-format
+#, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Membuat kotak surat: "
+msgstr "Ganti nama kotak surat %s ke: "
 
 #: imap/browse.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "Rename failed: %s"
-msgstr "SSL gagal: %s"
+msgstr "Penggantian nama gagal: %s"
 
 #: imap/browse.c:343
-#, fuzzy
 msgid "Mailbox renamed."
-msgstr "Kotak surat telah dibuat."
+msgstr "Kotak surat telah diganti namanya."
 
 #: imap/command.c:294
 msgid "Mailbox closed"
@@ -1783,11 +1781,11 @@ msgstr "tampilkan nama file yang sedang dipilih"
 
 #: keymap_alldefs.h:15
 msgid "subscribe to current mailbox (IMAP only)"
-msgstr "berlangganan ke kotak surat (untuk IMAP)"
+msgstr "berlangganan ke kotak surat ini (untuk IMAP)"
 
 #: keymap_alldefs.h:16
 msgid "unsubscribe to current mailbox (IMAP only)"
-msgstr "berhenti langganan dari kotak surat (untuk IMAP)"
+msgstr "berhenti langganan dari kotak surat ini (untuk IMAP)"
 
 #: keymap_alldefs.h:17
 msgid "toggle view all/subscribed mailboxes (IMAP only)"
@@ -1947,11 +1945,11 @@ msgstr "buat salinan (text/plain) yang sudah di-decode dan hapus"
 
 #: keymap_alldefs.h:56
 msgid "delete the current entry"
-msgstr "hapus entry"
+msgstr "hapus entry ini"
 
 #: keymap_alldefs.h:57
 msgid "delete the current mailbox (IMAP only)"
-msgstr "hapus kotak surat (untuk IMAP)"
+msgstr "hapus kotak surat ini (untuk IMAP)"
 
 #: keymap_alldefs.h:58
 msgid "delete all messages in subthread"
@@ -2095,7 +2093,7 @@ msgstr "forward surat dengan komentar"
 
 #: keymap_alldefs.h:93
 msgid "select the current entry"
-msgstr "pilih entry"
+msgstr "pilih entry ini"
 
 #: keymap_alldefs.h:94
 msgid "reply to all recipients"
@@ -2223,11 +2221,11 @@ msgstr "ke surat sebelumnya yang belum dibaca"
 
 #: keymap_alldefs.h:125
 msgid "mark the current thread as read"
-msgstr "tandai thread 'sudah dibaca'"
+msgstr "tandai thread ini 'sudah dibaca'"
 
 #: keymap_alldefs.h:126
 msgid "mark the current subthread as read"
-msgstr "tandai subthread 'sudah dibaca'"
+msgstr "tandai subthread ini 'sudah dibaca'"
 
 #: keymap_alldefs.h:127
 msgid "set a status flag on a message"
@@ -2299,7 +2297,7 @@ msgstr "ke halaman sebelumnya"
 
 #: keymap_alldefs.h:144
 msgid "print the current entry"
-msgstr "cetak entry"
+msgstr "cetak entry ini"
 
 #: keymap_alldefs.h:145
 msgid "query external program for addresses"
@@ -2326,9 +2324,8 @@ msgid "{internal}"
 msgstr "{jerohan}"
 
 #: keymap_alldefs.h:151
-#, fuzzy
 msgid "rename the current mailbox (IMAP only)"
-msgstr "hapus kotak surat (untuk IMAP)"
+msgstr "ganti nama kotak surat ini (untuk IMAP)"
 
 #: keymap_alldefs.h:152
 msgid "reply to a message"
@@ -2336,7 +2333,7 @@ msgstr "balas surat"
 
 #: keymap_alldefs.h:153
 msgid "use the current message as a template for a new one"
-msgstr "gunakan surat sebagai template"
+msgstr "gunakan surat ini sebagai template"
 
 #: keymap_alldefs.h:154
 msgid "save message/attachment to a file"
@@ -2376,7 +2373,7 @@ msgstr "urutkan terbalik surat-surat"
 
 #: keymap_alldefs.h:163
 msgid "tag the current entry"
-msgstr "tandai entry"
+msgstr "tandai entry ini"
 
 #: keymap_alldefs.h:164
 msgid "apply next function to tagged messages"
@@ -2388,11 +2385,11 @@ msgstr "lakukan fungsi berikutnya HANYA ke surat-surat yang ditandai"
 
 #: keymap_alldefs.h:166
 msgid "tag the current subthread"
-msgstr "tandai subthread"
+msgstr "tandai subthread ini"
 
 #: keymap_alldefs.h:167
 msgid "tag the current thread"
-msgstr "tandai thread"
+msgstr "tandai thread ini"
 
 #: keymap_alldefs.h:168
 msgid "toggle a message's 'new' flag"
@@ -2412,7 +2409,7 @@ msgstr "ke awal halaman"
 
 #: keymap_alldefs.h:172
 msgid "undelete the current entry"
-msgstr "tidak jadi hapus entry"
+msgstr "tidak jadi hapus entry ini"
 
 #: keymap_alldefs.h:173
 msgid "undelete all messages in thread"
@@ -2440,11 +2437,11 @@ msgstr "tampilkan keycode untuk penekanan tombol"
 
 #: keymap_alldefs.h:179
 msgid "show currently active limit pattern"
-msgstr "tampilkan kriteria batas yang aktif"
+msgstr "tampilkan kriteria batas yang sedang aktif"
 
 #: keymap_alldefs.h:180
 msgid "collapse/uncollapse current thread"
-msgstr "collapse/uncollapse thread"
+msgstr "collapse/uncollapse thread ini"
 
 #: keymap_alldefs.h:181
 msgid "collapse/uncollapse all threads"
@@ -3213,7 +3210,7 @@ msgstr "Cari: "
 
 #: pager.c:2081
 msgid "Help is currently being shown."
-msgstr "Bantuan sudah ditampilkan."
+msgstr "Bantuan sedang ditampilkan."
 
 #: pager.c:2110
 msgid "No more quoted text."

diff --git a/po/nl.po b/po/nl.po
index 8f21e5a..426c5ef 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,10 +1,10 @@
-# $Id: nl.po,v 3.22 2005/03/13 16:35:34 roessler Exp $
+# $Id: nl.po,v 3.23 2005/03/22 19:49:31 roessler Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: Mutt 1.5.6\n"
+"Project-Id-Version: Mutt 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-03-13 17:38+0100\n"
-"PO-Revision-Date: 2005-01-28 15:08+0100\n"
+"PO-Revision-Date: 2005-03-20 15:17+0100\n"
 "Last-Translator: René Clerc <rene@clerc.nl>\n"
 "Language-Team: René Clerc <rene@clerc.nl>\n"
 "MIME-Version: 1.0\n"
@@ -203,9 +203,8 @@ msgid "Create is only supported for IMAP mailboxes"
 msgstr "Alleen IMAP folders kunnen aangemaakt worden"
 
 #: browser.c:880
-#, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Alleen IMAP folders kunnen aangemaakt worden"
+msgstr "Alleen IMAP folders kunnen hernoemd worden"
 
 #: browser.c:901
 msgid "Delete is only supported for IMAP mailboxes"
@@ -1195,7 +1194,7 @@ msgstr "[-- Foutenuitvoer van %s --]\n"
 
 #: handler.c:1643
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- Fout: message/external-body heeft geen access-type paramter --]\n"
+msgstr "[-- Fout: message/external-body heeft geen access-type parameter --]\n"
 
 #: handler.c:1662
 #, c-format
@@ -1398,19 +1397,18 @@ msgid "Mailbox created."
 msgstr "Mailfolder is aangemaakt."
 
 #: imap/browse.c:325
-#, fuzzy, c-format
+#, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Mailfolder aanmaken: "
+msgstr "Mailfolder %s hernoemen naar: "
 
 #: imap/browse.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "Rename failed: %s"
-msgstr "SSL mislukt: %s"
+msgstr "Hernoemen mislukt: %s"
 
 #: imap/browse.c:343
-#, fuzzy
 msgid "Mailbox renamed."
-msgstr "Mailfolder is aangemaakt."
+msgstr "Mailfolder is hernoemd."
 
 #: imap/command.c:294
 msgid "Mailbox closed"
@@ -2321,9 +2319,8 @@ msgid "{internal}"
 msgstr "(intern)"
 
 #: keymap_alldefs.h:151
-#, fuzzy
 msgid "rename the current mailbox (IMAP only)"
-msgstr "verwijder de huidige mailfolder (alleen met IMAP)"
+msgstr "hernoem de huidige mailfolder (alleen met IMAP)"
 
 #: keymap_alldefs.h:152
 msgid "reply to a message"
@@ -2599,7 +2596,6 @@ msgstr ""
 "USA.\n"
 
 #: main.c:99
-#, fuzzy
 msgid ""
 "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2653,18 +2649,18 @@ msgstr ""
 "  -e <opdracht>\tspecificeer een uit te voeren opdracht na initialisatie\n"
 "  -f <file>\tspecificeer de te lezen mailfolder\n"
 "  -F <file>\tspecificeer een alternatieve muttrc\n"
-"  -H <file>\tspecificeer een een bestand om de headers uit te lezen\n"
+"  -H <file>\tspecificeer een bestand om de headers uit te lezen\n"
 "  -i <file>\tspecificeer een bestand dat Mutt moet bijsluiten in het "
-"antwoord\n"
+"bericht\n"
 "  -m <type>\tspecificeer een standaard mailfolder type\n"
-"  -n\t\tzorgt dat Mutt niet de systeem Muttrc inleest\n"
+"  -n\t\tzorgt dat Mutt de systeem Muttrc niet inleest\n"
 "  -p\t\troept een uitgesteld bericht op\n"
 "  -Q <variabele>\tvraagt de waarde van een configuratievariabele op\n"
 "  -R\t\topent de mailfolder met alleen-lezen rechten\n"
 "  -s <ond>\tspecificeer een onderwerp (tussen aanhalingstekens i.g.v. "
 "spaties)\n"
 "  -v\t\ttoont het versienummer en opties tijdens het compileren\n"
-"  -x\t\tsimuleert de mailx verstuurmodus\n"
+"  -x\t\tsimuleert de mailx verzendmodus\n"
 "  -y\t\tselecteert een mailfolder gespecificeerd in de `mailboxes' lijst\n"
 "  -z\t\tbeëindigt meteen als er geen berichten in de mailfolder staan\n"
 "  -Z\t\topent de eerste mailfolder met nieuwe berichten, eindigt indien "

diff --git a/po/ru.po b/po/ru.po
index ddd7533..13d90e2 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mutt-1.5.8i\n"
+"Project-Id-Version: mutt-1.5.9i\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-12 21:58+0100\n"
 "PO-Revision-Date: 2005-02-13 11:51+0200\n"
@@ -213,9 +213,9 @@ msgid "Create is only supported for IMAP mailboxes"
 msgstr "óÏÚÄÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
 
 #: browser.c:880
-#, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "óÏÚÄÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
+msgstr ""
+"ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
 
 #: browser.c:901
 msgid "Delete is only supported for IMAP mailboxes"
@@ -1410,19 +1410,18 @@ msgid "Mailbox created."
 msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÚÄÁÎ."
 
 #: imap/browse.c:325
-#, fuzzy, c-format
+#, c-format
 msgid "Rename mailbox %s to: "
-msgstr "óÏÚÄÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË: "
+msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË %s ×: "
 
 #: imap/browse.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "Rename failed: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ SSL-ÓÏÅÄÉÎÅÎÉÅ: %s"
+msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ: %s"
 
 #: imap/browse.c:343
-#, fuzzy
 msgid "Mailbox renamed."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÚÄÁÎ."
+msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÐÅÒÅÉÍÅÎÏ×ÁÎ."
 
 #: imap/command.c:294
 msgid "Mailbox closed"
@@ -2341,9 +2340,8 @@ msgid "{internal}"
 msgstr "{×ÎÕÔÒÅÎÎÉÊ}"
 
 #: keymap_alldefs.h:151
-#, fuzzy
 msgid "rename the current mailbox (IMAP only)"
-msgstr "ÕÄÁÌÉÔØ ÔÅËÕÝÉÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË (ÔÏÌØËÏ IMAP)"
+msgstr "ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÔÅËÕÝÉÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË (ÔÏÌØËÏ IMAP)"
 
 #: keymap_alldefs.h:152
 msgid "reply to a message"