From: Adeodato Simó Date: Mon, 15 Aug 2005 13:51:55 +0000 (+0200) Subject: Import mutt_1.5.10-1 X-Git-Tag: 1.5.10-1 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/b4c0283bbf4dfa85adf3df88b21bde4b2a48b11c Import mutt_1.5.10-1 --- diff --git a/debian/changelog b/debian/changelog index fffbe96..7e6d4c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,47 @@ +mutt (1.5.10-1) unstable; urgency=low + + * New upstream release, fixing the following bugs: + + does not store gpg passphrase when signing or decrypting has failed, + since that probably means it was wrong. (Closes: #132548) + + does not fail to delete attachments in unencrypted mails. (Closes: + #302500) + + * New functionality overview or otherwise noticeable news: + + $imap_check_subscribed variable to add the list of subscribed folders to + the buffy list. + + $braille_friendly variable to make Mutt more usable for blind users. + + $imap_login variable in case the login name on the IMAP server is + different to the name of the account ($imap_user). + + -D command line option to dump current configuration, after all + initialization files have been read. + + $imap_force_ssl gone. + + an empty limit is now interpreted as a request to cancel the current + limit. + + * Patches: + + 080_Md.paths_mutt.man: adjusted; upstream build system puts now the + right paths in mutt.1 using @bindir@. Install mutt.1 instead of mutt.man + in debian/rules. + + 080_Md.Muttrc: don't set menu_move_off in /etc/Muttrc since the + compile-time default is now what we want (pre-1.5.7 compatible). + + edit-threads, current-shortcut, incomplete-mbyte: removed, integrated + upstream. + + maildir-mtime: s/if/ifdef/ to get it to apply. + + compressed-folders: updated to 1.5.10. + + * Upstream now builds "complete" documentation, i.e., for all features + whether enabled or not. Disable that for Debian. [patch.docs-match-config.h] + + * Build-Depend on autotools-dev and use updated config.{guess,sub} at build + time to fix FTBFS on GNU/kFreeBSD. (Closes: #302735) + + * Update Standards-Version to 3.6.2 (no changes required). + + * Set myself as the maintainer, and remove Marco from Uploaders as agreed + with him. + + -- Adeodato Simó Mon, 15 Aug 2005 15:51:55 +0200 + mutt (1.5.9-2) unstable; urgency=high * Added a missing Build-Depend on mawk. (Closes: #310039) diff --git a/debian/control b/debian/control index 1abe4cc..919f918 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,9 @@ Source: mutt Section: mail Priority: standard -Maintainer: Marco d'Itri -Uploaders: Marco d'Itri , Adeodato Simó -Build-Depends: debhelper (>= 4), mawk, linuxdoc-tools-text, gettext, groff, libncurses5-dev, libsasl2-dev, libgnutls11-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.3-dev -Standards-Version: 3.6.1.1 +Maintainer: Adeodato Simó +Build-Depends: debhelper (>= 4), autotools-dev, mawk, linuxdoc-tools-text, gettext, groff, libncurses5-dev, libsasl2-dev, libgnutls11-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.3-dev +Standards-Version: 3.6.2 Package: mutt Architecture: any diff --git a/debian/patches/080_Md.Muttrc b/debian/patches/080_Md.Muttrc index d6a4f80..25b816d 100644 --- a/debian/patches/080_Md.Muttrc +++ b/debian/patches/080_Md.Muttrc @@ -1,7 +1,7 @@ diff -ruN mutt-1.5.9.orig/Muttrc.head.in mutt-1.5.9/Muttrc.head.in --- mutt-1.5.9.orig/Muttrc.head.in 2002-01-24 13:10:47.000000000 +0100 +++ mutt-1.5.9/Muttrc.head.in 2005-04-10 13:54:02.000000000 +0200 -@@ -6,6 +6,41 @@ +@@ -6,6 +6,38 @@ # ignore "from " received content- mime-version status x-status message-id ignore sender references return-path lines @@ -22,9 +22,6 @@ diff -ruN mutt-1.5.9.orig/Muttrc.head.in mutt-1.5.9/Muttrc.head.in +#bind pager previous-line +#bind pager next-line + -+# restore the behaviour of mutt versions up to 1.5.7 -+set menu_move_off -+ +# don't add the hostname to the From header +unset use_domain +# don't generate a From header diff --git a/debian/patches/080_Md.paths_mutt.man b/debian/patches/080_Md.paths_mutt.man index 9e3b0f0..667d5ed 100644 --- a/debian/patches/080_Md.paths_mutt.man +++ b/debian/patches/080_Md.paths_mutt.man @@ -5,10 +5,9 @@ diff -urN mutt-1.3.22.orig/doc/mutt.man mutt-1.3.22/doc/mutt.man User's personal mapping between MIME types and file extensions. .IP "/etc/mime.types" System mapping between MIME types and file extensions. --.IP "/usr/local/bin/mutt_dotlock" -+.IP "/usr/bin/mutt_dotlock" + .IP "@bindir@/mutt_dotlock" The privileged dotlocking program. --.IP "/usr/local/doc/mutt/manual.txt" +-.IP "@docdir@/manual.txt" +.IP "/usr/share/doc/mutt/manual.txt.gz" The Mutt manual. .SH BUGS diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update index 3e29601..48e81b3 100644 --- a/debian/patches/autotools-update +++ b/debian/patches/autotools-update @@ -1,36 +1,22 @@ -diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in ---- mutt-1.5.9.orig/Makefile.in 2005-03-13 17:37:46.000000000 +0100 -+++ mutt-1.5.9/Makefile.in 2005-04-03 19:58:55.328383264 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.2 from Makefile.am. -+# Makefile.in generated by automake 1.9.5 from Makefile.am. +diff -ru mutt-1.5.10.orig/Makefile.in mutt-1.5.10/Makefile.in +--- mutt-1.5.10.orig/Makefile.in 2005-08-11 23:50:19.000000000 +0200 ++++ mutt-1.5.10/Makefile.in 2005-08-15 14:04:23.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.9.5 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,7 +15,7 @@ +@@ -15,8 +15,6 @@ @SET_MAKE@ --SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) -+SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) - +-SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) +- srcdir = @srcdir@ top_srcdir = @top_srcdir@ -@@ -40,7 +40,7 @@ - build_triplet = @build@ - host_triplet = @host@ - EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \ -- makedoc$(EXEEXT) -+ pgpewrap$(EXEEXT) makedoc$(EXEEXT) - bin_PROGRAMS = mutt$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Muttrc.head.in \ -@@ -76,10 +76,10 @@ + VPATH = @srcdir@ +@@ -76,10 +74,10 @@ am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ @@ -45,30 +31,7 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ handler.$(OBJEXT) hash.$(OBJEXT) hdrline.$(OBJEXT) \ headers.$(OBJEXT) help.$(OBJEXT) hook.$(OBJEXT) \ -@@ -99,6 +99,10 @@ - am__DEPENDENCIES_1 = - am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT) - mutt_dotlock_OBJECTS = $(am_mutt_dotlock_OBJECTS) -+pgpewrap_SOURCES = pgpewrap.c -+pgpewrap_OBJECTS = pgpewrap.$(OBJEXT) -+pgpewrap_LDADD = $(LDADD) -+pgpewrap_DEPENDENCIES = @LIBOBJS@ - am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ - lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \ - pgppacket.$(OBJEXT) ascii.$(OBJEXT) -@@ -113,9 +117,9 @@ - CCLD = $(CC) - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) \ -- $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) -+ $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) - DIST_SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) \ -- $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) \ -+ $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c \ - $(pgpring_SOURCES) - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ -@@ -294,7 +298,7 @@ +@@ -298,7 +296,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.c mutt_SOURCES = $(BUILT_SOURCES) \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ @@ -77,7 +40,7 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ edit.c enter.c flags.c init.c filter.c from.c getdomain.c \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -@@ -325,7 +329,7 @@ +@@ -329,7 +327,7 @@ crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ @@ -86,17 +49,7 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ -@@ -441,6 +445,9 @@ - mutt_dotlock$(EXEEXT): $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES) - @rm -f mutt_dotlock$(EXEEXT) - $(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS) -+pgpewrap$(EXEEXT): $(pgpewrap_OBJECTS) $(pgpewrap_DEPENDENCIES) -+ @rm -f pgpewrap$(EXEEXT) -+ $(LINK) $(pgpewrap_LDFLAGS) $(pgpewrap_OBJECTS) $(pgpewrap_LDADD) $(LIBS) - pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) - @rm -f pgpring$(EXEEXT) - $(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS) -@@ -487,6 +494,7 @@ +@@ -494,6 +492,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@ @@ -104,100 +57,10 @@ diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@ -@@ -542,6 +550,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patchlist.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgp.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpewrap.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpinvoke.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpkey.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgplib.Po@am__quote@ -@@ -597,7 +606,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -609,7 +624,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -@@ -617,7 +632,13 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -638,7 +659,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -914,8 +935,9 @@ - - install-data-am: install-data-local - --install-exec-am: install-binPROGRAMS install-binSCRIPTS \ -- install-exec-local -+install-exec-am: install-binPROGRAMS install-binSCRIPTS -+ @$(NORMAL_INSTALL) -+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - - install-info: install-info-recursive - -@@ -956,9 +978,9 @@ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-binSCRIPTS \ - install-data install-data-am install-data-local install-exec \ -- install-exec-am install-exec-local install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -+ install-exec-am install-exec-hook install-info install-info-am \ -+ install-man install-strip installcheck installcheck-am \ -+ installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ -@@ -993,7 +1015,7 @@ - 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)/mutt_dotlock ; then \ - rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ - ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ -Only in mutt-1.5.9: autom4te.cache -diff -ru mutt-1.5.9.orig/config.h.in mutt-1.5.9/config.h.in ---- mutt-1.5.9.orig/config.h.in 2005-03-13 17:37:09.000000000 +0100 -+++ mutt-1.5.9/config.h.in 2005-04-03 19:58:50.546379495 +0200 +Only in mutt-1.5.10: autom4te.cache +diff -ru mutt-1.5.10.orig/config.h.in mutt-1.5.10/config.h.in +--- mutt-1.5.10.orig/config.h.in 2005-08-11 23:49:51.000000000 +0200 ++++ mutt-1.5.10/config.h.in 2005-08-15 14:04:19.000000000 +0200 @@ -498,6 +498,9 @@ /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT @@ -208,10 +71,10 @@ diff -ru mutt-1.5.9.orig/config.h.in mutt-1.5.9/config.h.in /* Define to use dotlocking for mailboxes. */ #undef USE_DOTLOCK -Only in mutt-1.5.9: config.h.in~ -diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure ---- mutt-1.5.9.orig/configure 2005-03-13 17:36:32.000000000 +0100 -+++ mutt-1.5.9/configure 2005-04-03 19:58:56.255190487 +0200 +Only in mutt-1.5.10: config.h.in~ +diff -ru mutt-1.5.10.orig/configure mutt-1.5.10/configure +--- mutt-1.5.10.orig/configure 2005-08-11 23:49:35.000000000 +0200 ++++ mutt-1.5.10/configure 2005-08-15 14:04:24.000000000 +0200 @@ -868,6 +868,7 @@ --enable-buffy-size Use file size attribute instead of access time --enable-mailtool Enable Sun mailtool attachments support @@ -220,7 +83,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure --enable-exact-address Enable regeneration of email addresses --enable-hcache Enable header caching --disable-iconv Disable iconv support -@@ -1001,7 +1002,7 @@ +@@ -1000,7 +1001,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi @@ -229,7 +92,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure done fi -@@ -2432,8 +2433,7 @@ +@@ -2431,8 +2432,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -239,7 +102,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2491,8 +2491,7 @@ +@@ -2490,8 +2490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -249,7 +112,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2608,8 +2607,7 @@ +@@ -2607,8 +2606,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -259,7 +122,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2663,8 +2661,7 @@ +@@ -2662,8 +2660,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -269,7 +132,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2709,8 +2706,7 @@ +@@ -2708,8 +2705,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -279,7 +142,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2754,8 +2750,7 @@ +@@ -2753,8 +2749,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -289,7 +152,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3007,8 +3002,7 @@ +@@ -3006,8 +3001,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -299,7 +162,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3062,8 +3056,7 @@ +@@ -3061,8 +3055,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -309,7 +172,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3398,8 +3391,7 @@ +@@ -3397,8 +3390,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -319,7 +182,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3569,8 +3561,7 @@ +@@ -3568,8 +3560,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -329,7 +192,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3645,8 +3636,7 @@ +@@ -3644,8 +3635,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -339,7 +202,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4299,8 +4289,7 @@ +@@ -4298,8 +4288,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -349,7 +212,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4416,8 +4405,7 @@ +@@ -4415,8 +4404,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -359,7 +222,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4499,8 +4487,7 @@ +@@ -4498,8 +4486,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -369,7 +232,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4529,8 +4516,7 @@ +@@ -4528,8 +4515,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -379,7 +242,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4600,8 +4586,7 @@ +@@ -4599,8 +4585,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -389,7 +252,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4653,8 +4638,7 @@ +@@ -4652,8 +4637,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -399,7 +262,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4725,8 +4709,7 @@ +@@ -4724,8 +4708,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -409,7 +272,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4778,8 +4761,7 @@ +@@ -4777,8 +4760,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -419,7 +282,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5002,8 +4984,7 @@ +@@ -5001,8 +4983,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -429,7 +292,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5150,8 +5131,7 @@ +@@ -5149,8 +5130,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -439,7 +302,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5213,8 +5193,7 @@ +@@ -5212,8 +5192,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -449,7 +312,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5276,8 +5255,7 @@ +@@ -5275,8 +5254,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -459,7 +322,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5317,8 +5295,7 @@ +@@ -5316,8 +5294,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -469,7 +332,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5374,8 +5351,7 @@ +@@ -5373,8 +5350,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -479,7 +342,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5415,8 +5391,7 @@ +@@ -5414,8 +5390,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -489,7 +352,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5480,8 +5455,7 @@ +@@ -5479,8 +5454,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -499,7 +362,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5512,10 +5486,8 @@ +@@ -5511,10 +5485,8 @@ esac else if test "$cross_compiling" = yes; then @@ -512,7 +375,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -5627,8 +5599,7 @@ +@@ -5626,8 +5598,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -522,7 +385,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5690,8 +5661,7 @@ +@@ -5689,8 +5660,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -532,7 +395,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5731,8 +5701,7 @@ +@@ -5730,8 +5700,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -542,7 +405,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5788,8 +5757,7 @@ +@@ -5787,8 +5756,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -552,7 +415,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5829,8 +5797,7 @@ +@@ -5828,8 +5796,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -562,7 +425,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5894,8 +5861,7 @@ +@@ -5893,8 +5860,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -572,7 +435,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5926,10 +5892,8 @@ +@@ -5925,10 +5891,8 @@ esac else if test "$cross_compiling" = yes; then @@ -585,7 +448,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6041,8 +6005,7 @@ +@@ -6040,8 +6004,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -595,7 +458,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6104,8 +6067,7 @@ +@@ -6103,8 +6066,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -605,7 +468,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6145,8 +6107,7 @@ +@@ -6144,8 +6106,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -615,7 +478,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6202,8 +6163,7 @@ +@@ -6201,8 +6162,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -625,7 +488,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6243,8 +6203,7 @@ +@@ -6242,8 +6202,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -635,7 +498,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6308,8 +6267,7 @@ +@@ -6307,8 +6266,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -645,7 +508,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6340,10 +6298,8 @@ +@@ -6339,10 +6297,8 @@ esac else if test "$cross_compiling" = yes; then @@ -658,7 +521,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6455,8 +6411,7 @@ +@@ -6454,8 +6410,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -668,7 +531,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6518,8 +6473,7 @@ +@@ -6517,8 +6472,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -678,7 +541,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6559,8 +6513,7 @@ +@@ -6558,8 +6512,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -688,7 +551,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6616,8 +6569,7 @@ +@@ -6615,8 +6568,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -698,7 +561,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6657,8 +6609,7 @@ +@@ -6656,8 +6608,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -708,7 +571,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6722,8 +6673,7 @@ +@@ -6721,8 +6672,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -718,7 +581,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6754,10 +6704,8 @@ +@@ -6753,10 +6703,8 @@ esac else if test "$cross_compiling" = yes; then @@ -731,16 +594,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6992,7 +6940,7 @@ - #define CRYPT_BACKEND_CLASSIC_PGP 1 - _ACEOF - -- PGPAUX_TARGET="pgpring pgpewrap" -+ PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" - fi - -@@ -7219,8 +7167,7 @@ +@@ -7218,8 +7166,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -750,7 +604,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7306,8 +7253,7 @@ +@@ -7305,8 +7252,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -760,7 +614,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7422,8 +7368,7 @@ +@@ -7421,8 +7367,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -770,7 +624,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7493,8 +7438,7 @@ +@@ -7492,8 +7437,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -780,7 +634,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7563,8 +7507,7 @@ +@@ -7562,8 +7506,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -790,7 +644,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7630,8 +7573,7 @@ +@@ -7629,8 +7572,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -800,7 +654,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7781,8 +7723,7 @@ +@@ -7780,8 +7722,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -810,7 +664,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7965,8 +7906,7 @@ +@@ -7964,8 +7905,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -820,7 +674,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8034,8 +7974,7 @@ +@@ -8033,8 +7973,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -830,7 +684,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8104,8 +8043,7 @@ +@@ -8103,8 +8042,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -840,7 +694,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8176,8 +8114,7 @@ +@@ -8175,8 +8113,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -850,7 +704,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8299,8 +8236,7 @@ +@@ -8298,8 +8235,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -860,7 +714,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8369,8 +8305,7 @@ +@@ -8368,8 +8304,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -870,7 +724,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8447,8 +8382,7 @@ +@@ -8446,8 +8381,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -880,7 +734,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8510,8 +8444,7 @@ +@@ -8509,8 +8443,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -890,7 +744,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8564,8 +8497,7 @@ +@@ -8563,8 +8496,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -900,7 +754,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8608,8 +8540,7 @@ +@@ -8607,8 +8539,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -910,7 +764,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8684,8 +8615,7 @@ +@@ -8683,8 +8614,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -920,7 +774,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8724,8 +8654,7 @@ +@@ -8723,8 +8653,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -930,7 +784,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8821,8 +8750,7 @@ +@@ -8820,8 +8749,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -940,7 +794,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8992,8 +8920,7 @@ +@@ -8991,8 +8919,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -950,7 +804,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9143,8 +9070,7 @@ +@@ -9142,8 +9069,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -960,7 +814,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9293,8 +9219,7 @@ +@@ -9292,8 +9218,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -970,7 +824,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9480,8 +9405,7 @@ +@@ -9479,8 +9404,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -980,7 +834,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9553,8 +9477,7 @@ +@@ -9552,8 +9476,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -990,7 +844,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9661,8 +9584,7 @@ +@@ -9660,8 +9583,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1000,7 +854,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9751,8 +9673,7 @@ +@@ -9750,8 +9672,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1010,7 +864,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9825,8 +9746,7 @@ +@@ -9824,8 +9745,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1020,7 +874,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9891,8 +9811,7 @@ +@@ -9890,8 +9810,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1030,7 +884,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9999,8 +9918,7 @@ +@@ -9998,8 +9917,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1040,7 +894,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10103,8 +10021,7 @@ +@@ -10102,8 +10020,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1050,7 +904,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10212,8 +10129,7 @@ +@@ -10211,8 +10128,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1060,7 +914,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10273,8 +10189,7 @@ +@@ -10272,8 +10188,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1070,7 +924,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10462,8 +10377,7 @@ +@@ -10461,8 +10376,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1080,7 +934,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10566,8 +10480,7 @@ +@@ -10565,8 +10479,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1090,7 +944,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10681,8 +10594,7 @@ +@@ -10680,8 +10593,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1100,7 +954,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10751,8 +10663,7 @@ +@@ -10750,8 +10662,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1110,7 +964,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10859,8 +10770,7 @@ +@@ -10858,8 +10769,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1120,7 +974,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10929,8 +10839,7 @@ +@@ -10928,8 +10838,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1130,7 +984,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11037,8 +10946,7 @@ +@@ -11036,8 +10945,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1140,7 +994,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11148,8 +11056,7 @@ +@@ -11147,8 +11055,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1150,7 +1004,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11648,8 +11555,7 @@ +@@ -11647,8 +11554,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1160,7 +1014,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11715,8 +11621,7 @@ +@@ -11714,8 +11620,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1170,7 +1024,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11817,8 +11722,7 @@ +@@ -11816,8 +11721,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1180,7 +1034,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11884,8 +11788,7 @@ +@@ -11883,8 +11787,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1190,7 +1044,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11990,8 +11893,7 @@ +@@ -11989,8 +11892,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1200,7 +1054,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12152,8 +12054,7 @@ +@@ -12151,8 +12053,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1210,7 +1064,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12226,8 +12127,7 @@ +@@ -12225,8 +12126,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1220,7 +1074,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12302,8 +12202,7 @@ +@@ -12301,8 +12201,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1230,7 +1084,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12496,8 +12395,7 @@ +@@ -12495,8 +12394,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1240,7 +1094,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12574,8 +12472,7 @@ +@@ -12573,8 +12471,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1250,7 +1104,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12684,8 +12581,7 @@ +@@ -12683,8 +12580,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1260,7 +1114,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12985,8 +12881,7 @@ +@@ -12941,8 +12837,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1270,7 +1124,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13159,8 +13054,7 @@ +@@ -13115,8 +13010,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1280,7 +1134,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13271,8 +13165,7 @@ +@@ -13237,8 +13131,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1290,7 +1144,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13395,8 +13288,7 @@ +@@ -13361,8 +13254,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1300,7 +1154,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13518,8 +13410,7 @@ +@@ -13484,8 +13376,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1310,7 +1164,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13623,8 +13514,7 @@ +@@ -13589,8 +13480,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1320,7 +1174,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13726,8 +13616,7 @@ +@@ -13692,8 +13582,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1330,7 +1184,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13829,8 +13718,7 @@ +@@ -13795,8 +13684,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1340,7 +1194,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13981,6 +13869,18 @@ +@@ -13947,6 +13835,18 @@ fi fi; @@ -1359,7 +1213,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure # Check whether --with-exec-shell or --without-exec-shell was given. if test "${with_exec_shell+set}" = set; then -@@ -14073,8 +13973,7 @@ +@@ -14039,8 +13939,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1369,7 +1223,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14159,8 +14058,7 @@ +@@ -14125,8 +14024,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1379,7 +1233,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14276,8 +14174,7 @@ +@@ -14242,8 +14140,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1389,7 +1243,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14342,8 +14239,7 @@ +@@ -14308,8 +14205,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1399,7 +1253,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14407,8 +14303,7 @@ +@@ -14373,8 +14269,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1409,7 +1263,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14489,8 +14384,7 @@ +@@ -14455,8 +14350,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1419,7 +1273,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14631,8 +14525,7 @@ +@@ -14597,8 +14491,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1429,7 +1283,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14770,8 +14663,7 @@ +@@ -14736,8 +14629,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1439,7 +1293,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14955,8 +14847,7 @@ +@@ -14921,8 +14813,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1449,7 +1303,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15246,8 +15137,7 @@ +@@ -15212,8 +15103,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1459,7 +1313,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15453,8 +15343,7 @@ +@@ -15419,8 +15309,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1469,7 +1323,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15536,8 +15425,7 @@ +@@ -15502,8 +15391,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1479,7 +1333,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15587,8 +15475,7 @@ +@@ -15553,8 +15441,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1489,7 +1343,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15663,8 +15550,7 @@ +@@ -15629,8 +15516,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1499,7 +1353,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15734,8 +15620,7 @@ +@@ -15700,8 +15586,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1509,7 +1363,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15798,8 +15683,7 @@ +@@ -15764,8 +15649,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1519,7 +1373,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15904,8 +15788,7 @@ +@@ -15870,8 +15754,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1529,7 +1383,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16043,8 +15926,7 @@ +@@ -16009,8 +15892,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1539,7 +1393,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16103,8 +15985,7 @@ +@@ -16069,8 +15951,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1549,7 +1403,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16215,8 +16096,7 @@ +@@ -16181,8 +16062,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1559,7 +1413,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16701,8 +16581,7 @@ +@@ -16667,8 +16547,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1569,7 +1423,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17056,8 +16935,7 @@ +@@ -17022,8 +16901,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1579,7 +1433,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17128,8 +17006,7 @@ +@@ -17094,8 +16972,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1589,7 +1443,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17280,8 +17157,7 @@ +@@ -17246,8 +17123,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1599,7 +1453,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17348,8 +17224,7 @@ +@@ -17314,8 +17190,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1609,7 +1463,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17415,8 +17290,7 @@ +@@ -17381,8 +17256,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1619,7 +1473,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17603,8 +17477,7 @@ +@@ -17569,8 +17443,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1629,7 +1483,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17710,8 +17583,7 @@ +@@ -17676,8 +17549,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1639,7 +1493,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17814,8 +17686,7 @@ +@@ -17780,8 +17652,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1649,7 +1503,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17883,8 +17754,7 @@ +@@ -17849,8 +17720,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1659,7 +1513,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17965,8 +17835,7 @@ +@@ -17931,8 +17801,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1669,7 +1523,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18029,8 +17898,7 @@ +@@ -17995,8 +17864,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1679,7 +1533,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18091,8 +17959,7 @@ +@@ -18057,8 +17925,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1689,7 +1543,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19085,11 +18952,6 @@ +@@ -19051,11 +18918,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1701,7 +1555,7 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ -@@ -19128,6 +18990,12 @@ +@@ -19094,6 +18956,12 @@ fi;; esac done` || { (exit 1); exit 1; } @@ -1714,34 +1568,33 @@ diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -diff -ru mutt-1.5.9.orig/imap/Makefile.in mutt-1.5.9/imap/Makefile.in ---- mutt-1.5.9.orig/imap/Makefile.in 2005-03-13 17:37:45.000000000 +0100 -+++ mutt-1.5.9/imap/Makefile.in 2005-04-03 19:58:54.831486654 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.2 from Makefile.am. -+# Makefile.in generated by automake 1.9.5 from Makefile.am. +diff -ru mutt-1.5.10.orig/imap/Makefile.in mutt-1.5.10/imap/Makefile.in +--- mutt-1.5.10.orig/imap/Makefile.in 2005-08-11 23:50:19.000000000 +0200 ++++ mutt-1.5.10/imap/Makefile.in 2005-08-15 14:04:22.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.9.5 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -diff -ru mutt-1.5.9.orig/m4/Makefile.in mutt-1.5.9/m4/Makefile.in ---- mutt-1.5.9.orig/m4/Makefile.in 2005-03-13 17:37:45.000000000 +0100 -+++ mutt-1.5.9/m4/Makefile.in 2005-04-03 19:58:54.969457936 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.2 from Makefile.am. -+# Makefile.in generated by automake 1.9.5 from Makefile.am. +@@ -15,8 +15,6 @@ + @SET_MAKE@ + + +-SOURCES = $(libimap_a_SOURCES) +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +diff -ru mutt-1.5.10.orig/m4/Makefile.in mutt-1.5.10/m4/Makefile.in +--- mutt-1.5.10.orig/m4/Makefile.in 2005-08-11 23:50:19.000000000 +0200 ++++ mutt-1.5.10/m4/Makefile.in 2005-08-15 14:04:22.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.9.5 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. @@ -217,9 +217,9 @@ exit 1;; \ esac; \ diff --git a/debian/patches/patch.docs-match-config.h b/debian/patches/patch.docs-match-config.h new file mode 100644 index 0000000..210f44b --- /dev/null +++ b/debian/patches/patch.docs-match-config.h @@ -0,0 +1,23 @@ +--- a/init.h ++++ b/init.h +@@ -80,9 +80,9 @@ + #define ISPELL "ispell" + #endif + +-/* build complete documentation */ ++/* Disable "build complete documentation" for Debian */ + +-#ifdef _MAKEDOC ++#if 0 + # ifndef USE_IMAP + # define USE_IMAP + # endif +@@ -1970,7 +1970,7 @@ + ** .pp + ** Example: set certificate_file=~/.mutt/certificates + */ +-# if defined _MAKEDOC || !defined(USE_GNUTLS) ++# ifndef USE_GNUTLS + { "ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1 }, + /* + ** .pp diff --git a/debian/rules b/debian/rules index af1b4a2..12d84fe 100755 --- a/debian/rules +++ b/debian/rules @@ -44,6 +44,12 @@ $(STAMP_DIR)/source.make: $B/stamp-h.in $B/config.h.in touch $@ + # update config.guess and config.sub + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub $B/config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess $B/config.guess + configure: $(STAMP_DIR)/configure $(STAMP_DIR)/configure: $(STAMP_DIR)/source.make CC=cc ac_cv_path_ISPELL=ispell \ @@ -96,7 +102,7 @@ binary-arch: $(STAMP_DIR)/build checkroot $B/contrib/*rc $B/contrib/sample.muttrc-tlr \ extra/ray.muttrc extra/colors.angdraug dh_installman \ - $B/doc/mutt.man $B/doc/dotlock.man \ + $B/doc/mutt.1 $B/doc/dotlock.man \ $B/doc/muttrc.man $B/doc/mbox.man install --mode=755 extra/debian-ldap-query extra/mailspell \ diff --git a/debian/scripts/vars b/debian/scripts/vars index 059d9da..25c2d2f 100644 --- a/debian/scripts/vars +++ b/debian/scripts/vars @@ -8,7 +8,7 @@ SOURCE_DIR=build-tree # For a single pkg, this is the directory that is embedded in the tarball. # For multiple pkgs, this is null. -TAR_DIR=mutt-1.5.9 +TAR_DIR=mutt-1.5.10 # Where to place all the stamp files. This directory can be removed, and # all the targets will then be rerun. STAMP_DIR=debian/stampdir diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders index 5ad6cd0..35634f0 100644 --- a/upstream/extra-patches/compressed-folders +++ b/upstream/extra-patches/compressed-folders @@ -7,19 +7,18 @@ The home page for this patch is: http://www.spinnaker.de/mutt/compressed/ * Patch last synced with upstream: - - Date: 2005-04-03 - - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.9.rr.compressed.1.gz + - Date: 2005-08-14 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.10.rr.compressed.1.gz * Changes made: - filterdiff -p1 \ $(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \ doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done) - - 2005-03-10: fix configure.in to match latest CVS. == END PATCH -diff -urN mutt-1.5.9/compress.c mutt-1.5.9-ro/compress.c ---- mutt-1.5.9/compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.9-ro/compress.c 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c +--- mutt-1.5.10/compress.c 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.10-ro/compress.c 2005-08-14 12:10:21.000000000 +0200 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -508,9 +507,9 @@ diff -urN mutt-1.5.9/compress.c mutt-1.5.9-ro/compress.c +} + +#endif /* USE_COMPRESSED */ -diff -urN mutt-1.5.9/compress.h mutt-1.5.9-ro/compress.h ---- mutt-1.5.9/compress.h 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.9-ro/compress.h 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h +--- mutt-1.5.10/compress.h 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.10-ro/compress.h 2005-08-14 12:10:21.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -539,12 +538,12 @@ diff -urN mutt-1.5.9/compress.h mutt-1.5.9-ro/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -diff -urN mutt-1.5.9/config.h.in mutt-1.5.9-ro/config.h.in -diff -urN mutt-1.5.9/configure mutt-1.5.9-ro/configure -diff -urN mutt-1.5.9/configure.in mutt-1.5.9-ro/configure.in ---- mutt-1.5.9/configure.in 2005-03-13 17:36:01.000000000 +0100 -+++ mutt-1.5.9-ro/configure.in 2005-03-20 14:11:05.000000000 +0100 -@@ -777,6 +777,11 @@ +diff -urN mutt-1.5.10/config.h.in mutt-1.5.10-ro/config.h.in +diff -urN mutt-1.5.10/configure mutt-1.5.10-ro/configure +diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in +--- mutt-1.5.10/configure.in 2005-08-11 23:49:24.000000000 +0200 ++++ mutt-1.5.10-ro/configure.in 2005-08-14 12:10:21.000000000 +0200 +@@ -753,6 +753,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -556,10 +555,10 @@ diff -urN mutt-1.5.9/configure.in mutt-1.5.9-ro/configure.in AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]), [if test $withval != yes; then AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", -diff -urN mutt-1.5.9/curs_main.c mutt-1.5.9-ro/curs_main.c ---- mutt-1.5.9/curs_main.c 2005-02-28 19:36:35.000000000 +0100 -+++ mutt-1.5.9-ro/curs_main.c 2005-03-20 14:06:20.000000000 +0100 -@@ -1076,6 +1076,11 @@ +diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c +--- mutt-1.5.10/curs_main.c 2005-08-11 21:37:01.000000000 +0200 ++++ mutt-1.5.10-ro/curs_main.c 2005-08-14 12:10:21.000000000 +0200 +@@ -1087,6 +1087,11 @@ { int check; @@ -571,14 +570,14 @@ diff -urN mutt-1.5.9/curs_main.c mutt-1.5.9-ro/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -urN mutt-1.5.9/doc/manual-4.html mutt-1.5.9-ro/doc/manual-4.html -diff -urN mutt-1.5.9/doc/manual-6.html mutt-1.5.9-ro/doc/manual-6.html -diff -urN mutt-1.5.9/doc/manual.html mutt-1.5.9-ro/doc/manual.html -diff -urN mutt-1.5.9/doc/manual.sgml mutt-1.5.9-ro/doc/manual.sgml -diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head ---- mutt-1.5.9/doc/manual.sgml.head 2005-02-19 14:49:49.000000000 +0100 -+++ mutt-1.5.9-ro/doc/manual.sgml.head 2005-03-20 14:06:20.000000000 +0100 -@@ -2539,6 +2539,176 @@ +diff -urN mutt-1.5.10/doc/manual-4.html mutt-1.5.10-ro/doc/manual-4.html +diff -urN mutt-1.5.10/doc/manual-6.html mutt-1.5.10-ro/doc/manual-6.html +diff -urN mutt-1.5.10/doc/manual.html mutt-1.5.10-ro/doc/manual.html +diff -urN mutt-1.5.10/doc/manual.sgml mutt-1.5.10-ro/doc/manual.sgml +diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head +--- mutt-1.5.10/doc/manual.sgml.head 2005-08-11 21:37:02.000000000 +0200 ++++ mutt-1.5.10-ro/doc/manual.sgml.head 2005-08-14 12:10:21.000000000 +0200 +@@ -2576,6 +2576,176 @@ macro pager \cb |urlview\n @@ -755,7 +754,7 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head Mutt's MIME Support

Quite a bit of effort has been made to make Mutt the premier text-mode -@@ -3118,6 +3288,8 @@ +@@ -3156,6 +3326,8 @@ @@ -764,7 +763,7 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head @@ -773,7 +772,7 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head @@ -782,11 +781,11 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head #include #include -@@ -1020,6 +1024,12 @@ +@@ -1014,6 +1018,12 @@ int mbox_close_mailbox (CONTEXT *ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); @@ -923,10 +922,10 @@ diff -urN mutt-1.5.9/mbox.c mutt-1.5.9-ro/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -diff -urN mutt-1.5.9/mutt.h mutt-1.5.9-ro/mutt.h ---- mutt-1.5.9/mutt.h 2005-02-28 16:13:57.000000000 +0100 -+++ mutt-1.5.9-ro/mutt.h 2005-03-20 14:06:20.000000000 +0100 -@@ -159,6 +159,11 @@ +diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h +--- mutt-1.5.10/mutt.h 2005-08-11 21:37:23.000000000 +0200 ++++ mutt-1.5.10-ro/mutt.h 2005-08-14 12:10:21.000000000 +0200 +@@ -161,6 +161,11 @@ #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -938,7 +937,7 @@ diff -urN mutt-1.5.9/mutt.h mutt-1.5.9-ro/mutt.h /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -824,6 +829,11 @@ +@@ -829,6 +834,11 @@ void *data; /* driver specific data */ #endif /* USE_IMAP */ @@ -950,12 +949,12 @@ diff -urN mutt-1.5.9/mutt.h mutt-1.5.9-ro/mutt.h short magic; /* mailbox type */ unsigned int locked : 1; /* is the mailbox locked? */ -diff -urN mutt-1.5.9/Muttrc mutt-1.5.9-ro/Muttrc -diff -urN mutt-1.5.9/Muttrc.head mutt-1.5.9-ro/Muttrc.head -diff -urN mutt-1.5.9/Muttrc.head.in mutt-1.5.9-ro/Muttrc.head.in -diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c ---- mutt-1.5.9/mx.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.9-ro/mx.c 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/Muttrc mutt-1.5.10-ro/Muttrc +diff -urN mutt-1.5.10/Muttrc.head mutt-1.5.10-ro/Muttrc.head +diff -urN mutt-1.5.10/Muttrc.head.in mutt-1.5.10-ro/Muttrc.head.in +diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c +--- mutt-1.5.10/mx.c 2005-08-02 09:08:01.000000000 +0200 ++++ mutt-1.5.10-ro/mx.c 2005-08-14 12:10:21.000000000 +0200 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1042,7 +1041,7 @@ diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1325,6 +1360,11 @@ +@@ -1330,6 +1365,11 @@ { int rc; @@ -1054,9 +1053,9 @@ diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c if (ctx) { if (ctx->locked) lock = 0; -diff -urN mutt-1.5.9/mx.h mutt-1.5.9-ro/mx.h ---- mutt-1.5.9/mx.h 2003-08-05 15:58:16.000000000 +0200 -+++ mutt-1.5.9-ro/mx.h 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h +--- mutt-1.5.10/mx.h 2003-08-05 15:58:16.000000000 +0200 ++++ mutt-1.5.10-ro/mx.h 2005-08-14 12:10:21.000000000 +0200 @@ -40,6 +40,9 @@ #ifdef USE_POP , M_POP @@ -1067,17 +1066,17 @@ diff -urN mutt-1.5.9/mx.h mutt-1.5.9-ro/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -diff -urN mutt-1.5.9/PATCHES mutt-1.5.9-ro/PATCHES ---- mutt-1.5.9/PATCHES 2005-03-13 17:33:06.000000000 +0100 -+++ mutt-1.5.9-ro/PATCHES 2005-03-20 17:59:28.000000000 +0100 +diff -urN mutt-1.5.10/PATCHES mutt-1.5.10-ro/PATCHES +--- mutt-1.5.10/PATCHES 2005-08-11 23:27:30.000000000 +0200 ++++ mutt-1.5.10-ro/PATCHES 2005-08-14 12:10:35.000000000 +0200 @@ -0,0 +1 @@ -+patch-1.5.9.rr.compressed.1 -diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po ---- mutt-1.5.9/po/de.po 2005-03-13 17:38:22.000000000 +0100 -+++ mutt-1.5.9-ro/po/de.po 2005-03-20 14:06:20.000000000 +0100 -@@ -715,6 +715,48 @@ - msgid "PGP already selected. Clear & continue ? " - msgstr "PGP bereits ausgewählt. Löschen und weiter?" ++patch-1.5.10.rr.compressed.1 +diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po +--- mutt-1.5.10/po/de.po 2005-08-11 23:50:35.000000000 +0200 ++++ mutt-1.5.10-ro/po/de.po 2005-08-14 12:12:20.000000000 +0200 +@@ -1281,6 +1281,48 @@ + msgid "Failed to figure out sender" + msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen." +#: compress.c:203 mbox.c:661 +msgid "Mailbox was corrupted!" @@ -1124,7 +1123,7 @@ diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -1305,6 +1347,10 @@ +@@ -1901,6 +1943,10 @@ msgid "Help for %s" msgstr "Hilfe für %s" @@ -1135,7 +1134,7 @@ diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po #: hook.c:246 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -2737,18 +2783,10 @@ +@@ -3383,18 +3429,10 @@ msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -1143,31 +1142,31 @@ diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po -msgid "Mailbox was corrupted!" -msgstr "Mailbox wurde zerstört!" - - #: mbox.c:699 mbox.c:953 + #: mbox.c:701 mbox.c:952 msgid "Fatal error! Could not reopen mailbox!" msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" --#: mbox.c:708 +-#: mbox.c:710 -msgid "Unable to lock mailbox!" -msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" - #. this means ctx->changed or ctx->deleted was set, but no #. * messages were found to be changed or deleted. This should #. * never happen, is we presume it is a bug in mutt. -diff -urN mutt-1.5.9/po/POTFILES.in mutt-1.5.9-ro/po/POTFILES.in ---- mutt-1.5.9/po/POTFILES.in 2002-03-27 09:44:17.000000000 +0100 -+++ mutt-1.5.9-ro/po/POTFILES.in 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in +--- mutt-1.5.10/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200 ++++ mutt-1.5.10-ro/po/POTFILES.in 2005-08-14 12:13:18.000000000 +0200 @@ -8,6 +8,7 @@ color.c commands.c compose.c +compress.c + crypt-gpgme.c crypt.c - curs_lib.c - curs_main.c -diff -urN mutt-1.5.9/status.c mutt-1.5.9-ro/status.c ---- mutt-1.5.9/status.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.9-ro/status.c 2005-03-20 14:06:20.000000000 +0100 + cryptglue.c +diff -urN mutt-1.5.10/status.c mutt-1.5.10-ro/status.c +--- mutt-1.5.10/status.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.10-ro/status.c 2005-08-14 12:10:21.000000000 +0200 @@ -97,6 +97,14 @@ case 'f': diff --git a/upstream/extra-patches/current-shortcut b/upstream/extra-patches/current-shortcut deleted file mode 100644 index 83b0b57..0000000 --- a/upstream/extra-patches/current-shortcut +++ /dev/null @@ -1,82 +0,0 @@ -# vi: ft=diff -This is the current shortcut patch patch by Byrial Ole Jensen -, updated by Christoph Berg . - -The home page for this patch is: - - http://home.worldonline.dk/byrial/mutt/patches/ (original version) - http://www.df7cb.de/projects/mutt/current_shortcut/ (.2 and above) - -* Patch last synced with upstream: - - Date: 2004-10-02 - - File: http://www.df7cb.de/projects/mutt/current_shortcut/current-shortcut.2 - -* Changes made: NONE. - -== END PATCH -diff -urp ../MUTT/mutt/PATCHES mutt/PATCHES ---- ../MUTT/mutt/PATCHES 2002-12-09 18:44:54.000000000 +0100 -+++ mutt/PATCHES 2004-10-02 16:30:07.000000000 +0200 -@@ -0,0 +1 @@ -+patch-1.5.6.cb.current_shortcut.2 -diff -urp ../MUTT/mutt/curs_main.c mutt/curs_main.c ---- ../MUTT/mutt/curs_main.c 2004-04-12 23:51:07.000000000 +0200 -+++ mutt/curs_main.c 2004-10-02 16:12:33.000000000 +0200 -@@ -1064,6 +1064,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); - mutt_error (_("%s is not a mailbox."), buf); - break; - } -+ mutt_str_replace (&CurrentFolder, buf); - - if (Context) - { -diff -urp ../MUTT/mutt/doc/manual.sgml.head mutt/doc/manual.sgml.head ---- ../MUTT/mutt/doc/manual.sgml.head 2004-07-21 13:33:04.000000000 +0200 -+++ mutt/doc/manual.sgml.head 2004-10-02 16:29:24.000000000 +0200 -@@ -2216,6 +2216,7 @@ path. - ! -- refers to your (incoming) mailbox - > -- refers to your file - < -- refers to your file -+^ -- refers to the current mailbox - - or !! -- refers to the file you've last visited - ˜ -- refers to your home directory - = or + -- refers to your directory -diff -urp ../MUTT/mutt/globals.h mutt/globals.h ---- ../MUTT/mutt/globals.h 2004-09-04 13:31:21.000000000 +0200 -+++ mutt/globals.h 2004-10-02 16:03:23.000000000 +0200 -@@ -117,6 +117,7 @@ WHERE char *Tochars; - WHERE char *Username; - WHERE char *Visual; - -+WHERE char *CurrentFolder; - WHERE char *LastFolder; - - WHERE LIST *AutoViewList INITVAL(0); -diff -urp ../MUTT/mutt/main.c mutt/main.c ---- ../MUTT/mutt/main.c 2004-06-18 17:24:22.000000000 +0200 -+++ mutt/main.c 2004-10-02 16:12:33.000000000 +0200 -@@ -887,6 +887,7 @@ int main (int argc, char **argv) - strfcpy (folder, NONULL(Spoolfile), sizeof (folder)); - mutt_expand_path (folder, sizeof (folder)); - -+ mutt_str_replace (&CurrentFolder, folder); - mutt_str_replace (&LastFolder, folder); - - if (flags & M_IGNORE) -diff -urp ../MUTT/mutt/muttlib.c mutt/muttlib.c ---- ../MUTT/mutt/muttlib.c 2004-09-04 13:31:22.000000000 +0200 -+++ mutt/muttlib.c 2004-10-02 16:16:12.000000000 +0200 -@@ -452,6 +452,13 @@ char *_mutt_expand_path (char *s, size_t - } - break; - -+ case '^': -+ { -+ strfcpy (p, NONULL(CurrentFolder), sizeof (p)); -+ tail = s + 1; -+ } -+ break; -+ - default: - { - *p = '\0'; diff --git a/upstream/extra-patches/edit-threads b/upstream/extra-patches/edit-threads deleted file mode 100644 index ca39078..0000000 --- a/upstream/extra-patches/edit-threads +++ /dev/null @@ -1,596 +0,0 @@ -# vi: ft=diff -This is the edit threads patch by Cedric Duval . - -The home page for this patch is: - - http://cedricduval.free.fr/mutt/patches/#threads - -* Patch last synced with upstream: - - Date: 2004-08-10 - - File: http://cedricduval.free.fr/mutt/patches/download/patch-1.5.5.1.cd.edit_threads.9.5 - -* Changes made: - - modified mutt.h part to apply cleanly. - - removed diffs for the following files: acconfig.h, configure, - configure.in, config.h.in. - -== END PATCH -diff -pruN mutt-1.5.5.1-orig/OPS mutt-1.5.5.1/OPS ---- mutt-1.5.5.1-orig/OPS Wed Nov 5 10:41:31 2003 -+++ mutt-1.5.5.1/OPS Tue Nov 11 02:52:33 2003 -@@ -96,6 +96,7 @@ OP_LAST_ENTRY "move to the last entry" - OP_LIST_REPLY "reply to specified mailing list" - OP_MACRO "execute a macro" - OP_MAIL "compose a new mail message" -+OP_MAIN_BREAK_THREAD "break the thread in two" - OP_MAIN_CHANGE_FOLDER "open a different folder" - OP_MAIN_CHANGE_FOLDER_READONLY "open a different folder in read only mode" - OP_MAIN_CLEAR_FLAG "clear a status flag from a message" -@@ -105,6 +106,7 @@ OP_MAIN_FETCH_MAIL "retrieve mail from P - OP_MAIN_FIRST_MESSAGE "move to the first message" - OP_MAIN_LAST_MESSAGE "move to the last message" - OP_MAIN_LIMIT "show only messages matching a pattern" -+OP_MAIN_LINK_THREADS "link tagged message to the current one" - OP_MAIN_NEXT_NEW "jump to the next new message" - OP_MAIN_NEXT_NEW_THEN_UNREAD "jump to the next new or unread message" - OP_MAIN_NEXT_SUBTHREAD "jump to the next subthread" -diff -pruN mutt-1.5.5.1-orig/copy.c mutt-1.5.5.1/copy.c ---- mutt-1.5.5.1-orig/copy.c Wed Nov 5 10:41:31 2003 -+++ mutt-1.5.5.1/copy.c Tue Nov 11 02:52:33 2003 -@@ -95,6 +95,12 @@ mutt_copy_hdr (FILE *in, FILE *out, long - (ascii_strncasecmp ("Content-Length:", buf, 15) == 0 || - ascii_strncasecmp ("Lines:", buf, 6) == 0)) - continue; -+ if ((flags & CH_UPDATE_REFS) && -+ ascii_strncasecmp ("References:", buf, 11) == 0) -+ continue; -+ if ((flags & CH_UPDATE_IRT) && -+ ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0) -+ continue; - ignore = 0; - } - -@@ -193,6 +199,12 @@ mutt_copy_hdr (FILE *in, FILE *out, long - ascii_strncasecmp ("type:", buf + 8, 5) == 0)) || - ascii_strncasecmp ("mime-version:", buf, 13) == 0)) - continue; -+ if ((flags & CH_UPDATE_REFS) && -+ ascii_strncasecmp ("References:", buf, 11) == 0) -+ continue; -+ if ((flags & CH_UPDATE_IRT) && -+ ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0) -+ continue; - - /* Find x -- the array entry where this header is to be saved */ - if (flags & CH_REORDER) -@@ -326,6 +338,8 @@ mutt_copy_hdr (FILE *in, FILE *out, long - CH_XMIT ignore Lines: and Content-Length: - CH_WEED do header weeding - CH_NOQFROM ignore ">From " line -+ CH_UPDATE_IRT update the In-Reply-To: header -+ CH_UPDATE_REFS update the References: header - - prefix - string to use if CH_PREFIX is set -@@ -335,6 +349,9 @@ int - mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix) - { - char buffer[SHORT_STRING]; -+ -+ flags |= (h->irt_changed ? CH_UPDATE_IRT : 0) -+ | (h->refs_changed ? CH_UPDATE_REFS : 0); - - if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) == -1) - return (-1); -@@ -358,7 +375,56 @@ mutt_copy_header (FILE *in, HEADER *h, F - if (flags & CH_UPDATE) - { - if ((flags & CH_NOSTATUS) == 0) -+#ifdef IMAP_EDIT_THREADS -+#define NEW_ENV new_env -+#else -+#define NEW_ENV env -+#endif - { -+ if (h->irt_changed && h->NEW_ENV->in_reply_to) -+ { -+ LIST *listp = h->NEW_ENV->in_reply_to; -+ -+ if (fputs ("In-Reply-To: ", out) == EOF) -+ return (-1); -+ -+ for (; listp; listp = listp->next) -+ if ((fputs (listp->data, out) == EOF) || (fputc (' ', out) == EOF)) -+ return (-1); -+ -+ if (fputc ('\n', out) == EOF) -+ return (-1); -+ } -+ -+ if (h->refs_changed && h->NEW_ENV->references) -+ { -+ LIST *listp = h->NEW_ENV->references, *refs = NULL, *t; -+ -+ if (fputs ("References: ", out) == EOF) -+ return (-1); -+ -+ /* Mutt stores references in reverse order, thus we create -+ * a reordered refs list that we can put in the headers */ -+ for (; listp; listp = listp->next, refs = t) -+ { -+ t = (LIST *)safe_malloc (sizeof (LIST)); -+ t->data = listp->data; -+ t->next = refs; -+ } -+ -+ for (; refs; refs = refs->next) -+ if ((fputs (refs->data, out) == EOF) || (fputc (' ', out) == EOF)) -+ return (-1); -+ -+ /* clearing refs from memory */ -+ for (t = refs; refs; refs = t->next, t = refs) -+ safe_free ((void **)&refs); -+ -+ if (fputc ('\n', out) == EOF) -+ return (-1); -+ } -+#undef NEW_ENV -+ - if (h->old || h->read) - { - if (fputs ("Status: ", out) == EOF) -diff -pruN mutt-1.5.5.1-orig/curs_main.c mutt-1.5.5.1/curs_main.c ---- mutt-1.5.5.1-orig/curs_main.c Wed Nov 5 10:41:31 2003 -+++ mutt-1.5.5.1/curs_main.c Tue Nov 11 02:52:33 2003 -@@ -930,6 +930,11 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); - else - { - mutt_set_flag (Context, CURHDR, M_TAG, !CURHDR->tagged); -+ -+ Context->last_tag = CURHDR->tagged ? CURHDR : -+ ((Context->last_tag == CURHDR && !CURHDR->tagged) -+ ? NULL : Context->last_tag); -+ - menu->redraw = REDRAW_STATUS; - if (option (OPTRESOLVE) && menu->current < Context->vcount - 1) - { -@@ -1162,6 +1167,89 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); - } - done = 1; - } -+ break; -+ -+ case OP_MAIN_BREAK_THREAD: -+ -+ CHECK_MSGCOUNT; -+ CHECK_VISIBLE; -+ CHECK_READONLY; -+ -+ if ((Sort & SORT_MASK) != SORT_THREADS) -+ mutt_error _("Threading is not enabled."); -+ -+#if defined (USE_IMAP) && ! defined (IMAP_EDIT_THREADS) -+ else if (Context->magic == M_IMAP) -+ mutt_error _("Compile Mutt with --enable-imap-edit-threads for break-thread support"); -+#endif -+ -+ else -+ { -+ { -+ HEADER *oldcur = CURHDR; -+ -+ mutt_break_thread (CURHDR); -+ mutt_sort_headers (Context, 1); -+ menu->current = oldcur->virtual; -+ } -+ -+ Context->changed = 1; -+ mutt_message _("Thread broken"); -+ -+ if (menu->menu == MENU_PAGER) -+ { -+ op = OP_DISPLAY_MESSAGE; -+ continue; -+ } -+ else -+ menu->redraw |= REDRAW_INDEX; -+ } -+ -+ break; -+ -+ case OP_MAIN_LINK_THREADS: -+ -+ CHECK_MSGCOUNT; -+ CHECK_VISIBLE; -+ CHECK_READONLY; -+ -+ if ((Sort & SORT_MASK) != SORT_THREADS) -+ mutt_error _("Threading is not enabled."); -+ -+#if defined (USE_IMAP) && ! defined (IMAP_EDIT_THREADS) -+ else if (Context->magic == M_IMAP) -+ mutt_error _("Compile Mutt with --enable-imap-edit-threads for link-threads support"); -+#endif -+ -+ else if (!CURHDR->env->message_id) -+ mutt_error _("No Message-ID: header available to link thread"); -+ else if (!tag && (!Context->last_tag || !Context->last_tag->tagged)) -+ mutt_error _("First, please tag a message to be linked here"); -+ else -+ { -+ HEADER *oldcur = CURHDR; -+ -+ if (mutt_link_threads (CURHDR, tag ? NULL : Context->last_tag, -+ Context)) -+ { -+ mutt_sort_headers (Context, 1); -+ menu->current = oldcur->virtual; -+ -+ Context->changed = 1; -+ mutt_message _("Threads linked"); -+ } -+ else -+ mutt_error _("No thread linked"); -+ } -+ -+ if (menu->menu == MENU_PAGER) -+ { -+ op = OP_DISPLAY_MESSAGE; -+ continue; -+ } -+ else -+ menu->redraw |= REDRAW_STATUS | REDRAW_INDEX; -+ - break; - - case OP_EDIT_TYPE: -diff -pruN mutt-1.5.5.1-orig/doc/manual.sgml.head mutt-1.5.5.1/doc/manual.sgml.head ---- mutt-1.5.5.1-orig/doc/manual.sgml.head Wed Nov 5 10:41:34 2003 -+++ mutt-1.5.5.1/doc/manual.sgml.head Tue Nov 11 02:52:33 2003 -@@ -2170,8 +2170,43 @@ used a threaded news client, this is the - with large volume mailing lists easier because you can easily delete - uninteresting threads and quickly find topics of value. - -+Editing threads -+

-+Mutt has the ability to dynamically restructure threads that are broken -+either by misconfigured software or bad behaviour from some -+correspondents. This allows to clean your mailboxes formats) from these -+annoyances which make it hard to follow a discussion. -+ -+If you want to use these functions with IMAP, you need to compile Mutt -+with the Linking threads -+

-+ -+Some mailers tend to "forget" to correctly set the "In-Reply-To:" and -+"References:" headers when replying to a message. This results in broken -+discussions because Mutt has not enough information to guess the correct -+threading. -+You can fix this by tagging the reply, then moving to the parent message -+and using the ``link-threads'' function (bound to & by default). The -+reply will then be connected to this "parent" message. -+ -+You can also connect multiple childs at once, tagging them and using the -+tag-prefix command (';') or the auto_tag option. -+ -+Breaking threads -+

-+ -+On mailing lists, some people are in the bad habit of starting a new -+discussion by hitting "reply" to any message from the list and changing -+the subject to a totally unrelated one. -+You can fix such threads by using the ``break-thread'' function (bound -+by default to #), which will turn the subthread starting from the -+current message into a whole different thread. -+ - Delivery Status Notification (DSN) Support -

-+ - RFC1894 defines a set of MIME content types for relaying information - about the status of electronic mail messages. These can be thought of as - ``return receipts.'' Berkeley sendmail 8.8.x currently has some command -diff -pruN mutt-1.5.5.1-orig/functions.h mutt-1.5.5.1/functions.h ---- mutt-1.5.5.1-orig/functions.h Wed Nov 5 10:41:31 2003 -+++ mutt-1.5.5.1/functions.h Tue Nov 11 02:52:33 2003 -@@ -69,6 +69,7 @@ struct binding_t OpGeneric[] = { - struct binding_t OpMain[] = { - { "create-alias", OP_CREATE_ALIAS, "a" }, - { "bounce-message", OP_BOUNCE_MESSAGE, "b" }, -+ { "break-thread", OP_MAIN_BREAK_THREAD, "#" }, - { "change-folder", OP_MAIN_CHANGE_FOLDER, "c" }, - { "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" }, - { "collapse-thread", OP_MAIN_COLLAPSE_THREAD, "\033v" }, -@@ -95,6 +96,7 @@ struct binding_t OpMain[] = { - { "next-undeleted", OP_MAIN_NEXT_UNDELETED, "j" }, - { "previous-undeleted", OP_MAIN_PREV_UNDELETED, "k" }, - { "limit", OP_MAIN_LIMIT, "l" }, -+ { "link-threads", OP_MAIN_LINK_THREADS, "&" }, - { "list-reply", OP_LIST_REPLY, "L" }, - { "mail", OP_MAIL, "m" }, - { "toggle-new", OP_TOGGLE_NEW, "N" }, -@@ -153,6 +155,7 @@ struct binding_t OpMain[] = { - }; - - struct binding_t OpPager[] = { -+ { "break-thread", OP_MAIN_BREAK_THREAD, "#" }, - { "create-alias", OP_CREATE_ALIAS, "a" }, - { "bounce-message", OP_BOUNCE_MESSAGE, "b" }, - { "change-folder", OP_MAIN_CHANGE_FOLDER, "c" }, -@@ -175,6 +178,7 @@ struct binding_t OpPager[] = { - { "next-entry", OP_NEXT_ENTRY, "J" }, - { "previous-undeleted",OP_MAIN_PREV_UNDELETED, "k" }, - { "previous-entry", OP_PREV_ENTRY, "K" }, -+ { "link-threads", OP_MAIN_LINK_THREADS, "&" }, - { "list-reply", OP_LIST_REPLY, "L" }, - { "redraw-screen", OP_REDRAW, "\014" }, - { "mail", OP_MAIL, "m" }, -diff -pruN mutt-1.5.5.1-orig/imap/imap.c mutt-1.5.5.1/imap/imap.c ---- mutt-1.5.5.1-orig/imap/imap.c Wed Nov 5 10:41:36 2003 -+++ mutt-1.5.5.1/imap/imap.c Tue Nov 11 02:52:33 2003 -@@ -980,9 +980,11 @@ int imap_sync_mailbox (CONTEXT* ctx, int - mutt_buffer_addstr (&cmd, "UID STORE "); - mutt_buffer_addstr (&cmd, uid); - -- /* if attachments have been deleted we delete the message and reupload -- * it. This works better if we're expunging, of course. */ -- if (ctx->hdrs[n]->attach_del) -+ /* if the message has been rethreaded or attachments have been deleted -+ * we delete the message and reupload it. -+ * This works better if we're expunging, of course. */ -+ if (ctx->hdrs[n]->refs_changed || ctx->hdrs[n]->irt_changed || -+ ctx->hdrs[n]->attach_del) - { - dprint (3, (debugfile, "imap_sync_mailbox: Attachments to be deleted, falling back to _mutt_save_message\n")); - if (!appendctx) -diff -pruN mutt-1.5.5.1-orig/main.c mutt-1.5.5.1/main.c ---- mutt-1.5.5.1-orig/main.c Tue Mar 4 08:49:48 2003 -+++ mutt-1.5.5.1/main.c Tue Nov 11 02:52:33 2003 -@@ -228,6 +228,12 @@ static void show_version (void) - "-USE_IMAP " - #endif - -+#ifdef IMAP_EDIT_THREADS -+ "+IMAP_EDIT_THREADS " -+#else -+ "-IMAP_EDIT_THREADS " -+#endif -+ - #ifdef USE_GSS - "+USE_GSS " - #else -diff -pruN mutt-1.5.5.1-orig/mh.c mutt-1.5.5.1/mh.c ---- mutt-1.5.5.1-orig/mh.c Wed Nov 5 10:41:32 2003 -+++ mutt-1.5.5.1/mh.c Tue Nov 11 02:52:33 2003 -@@ -1220,7 +1220,7 @@ static int mh_sync_message (CONTEXT * ct - { - HEADER *h = ctx->hdrs[msgno]; - -- if (h->attach_del) -+ if (h->attach_del || h->refs_changed || h->irt_changed) - if (mh_rewrite_message (ctx, msgno) != 0) - return -1; - -@@ -1231,9 +1231,9 @@ static int maildir_sync_message (CONTEXT - { - HEADER *h = ctx->hdrs[msgno]; - -- if (h->attach_del) -+ if (h->attach_del || h->refs_changed || h->irt_changed) - { -- /* when doing attachment deletion, fall back to the MH case. */ -+ /* when doing attachment deletion/rethreading, fall back to the MH case. */ - if (mh_rewrite_message (ctx, msgno) != 0) - return (-1); - } -diff -pruN mutt-1.5.5.1-orig/mutt.h mutt-1.5.5.1/mutt.h ---- mutt-1.5.5.1-orig/mutt.h Wed Nov 5 10:41:32 2003 -+++ mutt-1.5.5.1/mutt.h Tue Nov 11 02:52:33 2003 -@@ -92,6 +92,8 @@ - #define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */ - #define CH_FORCE_FROM (1<<14) /* give CH_FROM precedence over CH_WEED? */ - #define CH_NOQFROM (1<<15) /* give CH_FROM precedence over CH_WEED? */ -+#define CH_UPDATE_IRT (1<<16) /* update In-Reply-To: */ -+#define CH_UPDATE_REFS (1<<17) /* update References: */ - - /* flags for mutt_enter_string() */ - #define M_ALIAS 1 /* do alias "completion" by calling up the alias-menu */ -@@ -506,8 +508,9 @@ typedef struct list_t - - #define mutt_new_list() safe_calloc (1, sizeof (LIST)) - void mutt_free_list (LIST **); - void mutt_free_rx_list (RX_LIST **); - void mutt_free_spam_list (SPAM_LIST **); -+LIST *mutt_copy_list (LIST *); - int mutt_matches_ignore (const char *, LIST *); - - /* add an element to a list */ -@@ -647,6 +650,8 @@ typedef struct header - unsigned int subject_changed : 1; /* used for threading */ - unsigned int threaded : 1; /* used for threading */ - unsigned int display_subject : 1; /* used for threading */ -+ unsigned int irt_changed : 1; /* In-Reply-To changed to link/break threads */ -+ unsigned int refs_changed : 1; /* References changed to break thread */ - unsigned int recip_valid : 1; /* is_recipient is valid */ - unsigned int active : 1; /* message is not to be removed */ - unsigned int trash : 1; /* message is marked as trashed on disk. -@@ -687,6 +692,10 @@ typedef struct header - char *tree; /* character string to print thread tree */ - struct thread *thread; - -+#ifdef IMAP_EDIT_THREADS -+ ENVELOPE *new_env; /* envelope information for rethreading */ -+#endif -+ - #ifdef MIXMASTER - LIST *chain; - #endif -@@ -752,6 +761,7 @@ typedef struct - char *pattern; /* limit pattern string */ - pattern_t *limit_pattern; /* compiled limit pattern */ - HEADER **hdrs; -+ HEADER *last_tag; /* last tagged msg. used to link threads */ - THREAD *tree; /* top of thread tree */ - HASH *id_hash; /* hash table by msg id */ - HASH *subj_hash; /* hash table by subject */ -diff -pruN mutt-1.5.5.1-orig/mx.c mutt-1.5.5.1/mx.c ---- mutt-1.5.5.1-orig/mx.c Wed Nov 5 10:41:32 2003 -+++ mutt-1.5.5.1/mx.c Tue Nov 11 02:52:33 2003 -@@ -1161,6 +1161,8 @@ int mx_sync_mailbox (CONTEXT *ctx, int * - ctx->deleted = 0; - } - } -+ else if (ctx->last_tag && ctx->last_tag->deleted) -+ ctx->last_tag = NULL; /* reset last tagged msg now useless */ - } - - /* really only for IMAP - imap_sync_mailbox results in a call to -diff -pruN mutt-1.5.5.1-orig/pager.c mutt-1.5.5.1/pager.c ---- mutt-1.5.5.1-orig/pager.c Wed Nov 5 10:41:32 2003 -+++ mutt-1.5.5.1/pager.c Tue Nov 11 02:52:33 2003 -@@ -2481,6 +2481,11 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE); - case OP_TAG: - CHECK_MODE(IsHeader (extra)); - mutt_set_flag (Context, extra->hdr, M_TAG, !extra->hdr->tagged); -+ -+ Context->last_tag = extra->hdr->tagged ? extra->hdr : -+ ((Context->last_tag == extra->hdr && !extra->hdr->tagged) -+ ? NULL : Context->last_tag); -+ - redraw = REDRAW_STATUS | REDRAW_INDEX; - if (option (OPTRESOLVE)) - { -diff -pruN mutt-1.5.5.1-orig/protos.h mutt-1.5.5.1/protos.h ---- mutt-1.5.5.1-orig/protos.h Wed Nov 5 10:41:33 2003 -+++ mutt-1.5.5.1/protos.h Tue Nov 11 02:52:33 2003 -@@ -146,6 +146,7 @@ void mutt_block_signals (void); - void mutt_block_signals_system (void); - void mutt_body_handler (BODY *, STATE *); - int mutt_bounce_message (FILE *fp, HEADER *, ADDRESS *); -+void mutt_break_thread (HEADER *); - void mutt_buffy (char *, size_t); - int mutt_buffy_list (void); - void mutt_canonical_charset (char *, size_t, const char *); -@@ -286,6 +287,7 @@ int mutt_is_list_recipient (int, ADDRESS - int mutt_is_subscribed_list (ADDRESS *); - int mutt_is_text_part (BODY *); - int mutt_is_valid_mailbox (const char *); -+int mutt_link_threads (HEADER *, HEADER *, CONTEXT *); - int mutt_lookup_mime_type (BODY *, const char *); - int mutt_messages_in_thread (CONTEXT *, HEADER *, int); - int mutt_multi_choice (char *prompt, char *letters); -diff -pruN mutt-1.5.5.1-orig/thread.c mutt-1.5.5.1/thread.c ---- mutt-1.5.5.1-orig/thread.c Wed Nov 5 10:41:34 2003 -+++ mutt-1.5.5.1/thread.c Tue Nov 11 02:52:33 2003 -@@ -1333,3 +1333,105 @@ HASH *mutt_make_subj_hash (CONTEXT *ctx) - - return hash; - } -+ -+static void clean_references (THREAD *brk, THREAD *cur) -+{ -+ THREAD *p; -+ LIST *ref = NULL; -+ int done = 0; -+ -+ for (; cur; cur = cur->next, done = 0) -+ { -+ /* parse subthread recursively */ -+ clean_references (brk, cur->child); -+ -+ if (!cur->message) -+ break; /* skip pseudo-message */ -+ -+ /* Looking for the first bad reference according to the new threading. -+ * Optimal since Mutt stores the references in reverse order, and the -+ * first loop should match immediatly for mails respecting RFC2822. */ -+ for (p = brk; !done && p; p = p->parent) -+ for (ref = cur->message->env->references; p->message && ref; ref = ref->next) -+ if (!mutt_strcasecmp (ref->data, p->message->env->message_id)) -+ { -+ done = 1; -+ break; -+ } -+ -+ if (done) -+ { -+ HEADER *h = cur->message; -+ -+ /* clearing the References: header from obsolete Message-Id(s) */ -+ mutt_free_list (&ref->next); -+ -+#ifdef IMAP_EDIT_THREADS -+ if (h->new_env) -+ mutt_free_list (&h->new_env->references); -+ else -+ h->new_env = mutt_new_envelope (); -+ -+ h->new_env->references = mutt_copy_list (h->env->references); -+#endif -+ -+ h->refs_changed = h->changed = 1; -+ } -+ } -+} -+ -+void mutt_break_thread (HEADER *hdr) -+{ -+ mutt_free_list (&hdr->env->in_reply_to); -+ mutt_free_list (&hdr->env->references); -+ hdr->irt_changed = hdr->refs_changed = hdr->changed = 1; -+ -+#ifdef IMAP_EDIT_THREADS -+ if (hdr->new_env) -+ { -+ mutt_free_list (&hdr->new_env->in_reply_to); -+ mutt_free_list (&hdr->new_env->references); -+ } -+ else -+ hdr->new_env = mutt_new_envelope (); -+#endif -+ -+ clean_references (hdr->thread, hdr->thread->child); -+} -+ -+static int link_threads (HEADER *parent, HEADER *child, CONTEXT *ctx) -+{ -+ if (child == parent) -+ return 0; -+ -+ mutt_break_thread (child); -+ -+ child->env->in_reply_to = mutt_new_list (); -+ child->env->in_reply_to->data = safe_strdup (parent->env->message_id); -+ -+#ifdef IMAP_EDIT_THREADS -+ child->new_env->in_reply_to = mutt_new_list (); -+ child->new_env->in_reply_to->data = safe_strdup (parent->env->message_id); -+#endif -+ -+ mutt_set_flag (ctx, child, M_TAG, 0); -+ -+ child->irt_changed = child->changed = 1; -+ return 1; -+} -+ -+int mutt_link_threads (HEADER *cur, HEADER *last, CONTEXT *ctx) -+{ -+ int i, changed = 0; -+ -+ if (!last) -+ { -+ for (i = 0; i < ctx->vcount; i++) -+ if (ctx->hdrs[Context->v2r[i]]->tagged) -+ changed |= link_threads (cur, ctx->hdrs[Context->v2r[i]], ctx); -+ } -+ else -+ changed = link_threads (cur, last, ctx); -+ -+ return changed; -+} -diff -pruN mutt-1.5.5.1-orig/PATCHES mutt-1.5.5.1/PATCHES ---- mutt-1.5.5.1-orig/PATCHES Tue Apr 15 15:18:34 2003 -+++ mutt-1.5.5.1/PATCHES Tue Nov 11 02:52:33 2003 -@@ -1,0 +1 @@ -+patch-1.5.5.1.cd.edit_threads.9.5 diff --git a/upstream/extra-patches/edit-threads.debian b/upstream/extra-patches/edit-threads.debian deleted file mode 100644 index ef1ade8..0000000 --- a/upstream/extra-patches/edit-threads.debian +++ /dev/null @@ -1,4 +0,0 @@ ---- a/debian-config.h -+++ b/debian-config.h -@@ -0,0 +1 @@ -+#define IMAP_EDIT_THREADS 1 diff --git a/upstream/extra-patches/incomplete-mbyte b/upstream/extra-patches/incomplete-mbyte deleted file mode 100644 index 7517fa4..0000000 --- a/upstream/extra-patches/incomplete-mbyte +++ /dev/null @@ -1,55 +0,0 @@ -# vi: ft=diff -This is the incomplete multibyte patch by Anders Helmersson -. - -It was received at Debian's BTS, Bug#260623. - -* Patch last synced with upstream: - - Date: 2004-07-22 - - File: http://bugs.debian.org/cgi-bin/bugreport.cgi/patch-incomplete_multibyte-2?bug=260623&msg=3&att=1 - -* Changes made: - - 2004-07-22: added entry to PATCHES file. - - 2004-07-22: adjusted paths in the diff (to apply with patch -p1). - -== END PATCH -Index: pager.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pager.c,v -retrieving revision 3.16 -diff -u -r3.16 pager.c ---- a/pager.c 12 Jul 2004 13:35:27 -0000 3.16 -+++ b/pager.c 21 Jul 2004 08:10:06 -0000 -@@ -972,6 +972,9 @@ - unsigned char *p; - static int b_read; - -+ size_t k, n; -+ wchar_t wc; -+ - if (*buf_ready == 0) - { - buf[blen - 1] = 0; -@@ -986,6 +989,18 @@ - b_read = (int) (*last_pos - offset); - *buf_ready = 1; - -+ /* trim tail of buf so that it contains complete multibyte characters */ -+ for (n = b_read, p = buf; n > 0; p += k, n -= k) -+ { -+ k = mbrtowc (&wc, (char *) p, n, NULL); -+ if (k == -2) -+ break; -+ else if (k == -1 || k == 0) -+ k = 1; -+ } -+ b_read -= n; -+ buf[b_read] = 0; -+ - /* copy "buf" to "fmt", but without bold and underline controls */ - p = buf; - while (*p) ---- mutt.orig/PATCHES 1970-01-01 01:00:00.000000000 +0100 -+++ mutt/PATCHES 2003-08-09 15:51:11.000000000 +0200 -@@ -1,0 +1 @@ -+patch.helmersson.incomplete-mbyte.2 diff --git a/upstream/extra-patches/maildir-mtime b/upstream/extra-patches/maildir-mtime index 92e5654..7998982 100644 --- a/upstream/extra-patches/maildir-mtime +++ b/upstream/extra-patches/maildir-mtime @@ -125,7 +125,7 @@ The home page for this patch is: + ** wish to leave this option unset. + ** + */ - #if USE_HCACHE + #ifdef USE_HCACHE { "header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0 }, --- DEBIAN/mutt.h diff --git a/upstream/patches/cvs_2005-04-03 b/upstream/patches/cvs_2005-04-03 deleted file mode 100644 index 2b51ad9..0000000 --- a/upstream/patches/cvs_2005-04-03 +++ /dev/null @@ -1,2765 +0,0 @@ -Index: mutt/ChangeLog -=================================================================== -RCS file: /home/roessler/cvs/mutt/ChangeLog,v -retrieving revision 3.406 -retrieving revision 3.420 -diff -u -p -r3.406 -r3.420 ---- mutt/ChangeLog 13 Mar 2005 16:29:39 -0000 3.406 -+++ mutt/ChangeLog 3 Apr 2005 00:15:36 -0000 3.420 -@@ -1,3 +1,78 @@ -+2005-04-03 00:14:51 Daniel Jacobowitz (brendan) -+ -+ * imap/imap.c, imap/imap_private.h, imap/message.c: Synchronise -+ message flags before moving messages. -+ -+2005-03-31 04:55:09 Thomas Glanzmann (brendan) -+ -+ * mh.c: Another hcache cygwin portability fix. -+ -+2005-03-23 10:51:11 Thomas Glanzmann (roessler) -+ -+ * init.h, mh.c, mutt.h: Maildir header cache. -+ -+2005-03-22 19:58:15 Horst Schirmeier (roessler) -+ -+ * Makefile.am: Use install-exec-hook install of -+ install-exec-local. -+ -+2005-03-22 19:53:49 Ronny Haryanto (roessler) -+ -+ * po/id.po: update -+ -+2005-03-22 19:49:31 René Clerc (roessler) -+ -+ * po/nl.po: update -+ -+2005-03-22 19:48:35 Roland Rosenfeld (roessler) -+ -+ * po/de.po: update -+ -+2005-03-22 19:46:59 Paul Walker (roessler) -+ -+ * init.c, init.h: remove some unused functions. -+ -+2005-03-22 19:43:13 Vsevolod Volkov (roessler) -+ -+ * po/ru.po: update -+ -+2005-03-22 03:40:54 Thomas Glanzmann (brendan) -+ -+ * hcache.c, imap/imap.c, imap/imap_private.h, imap/message.c, -+ protos.h: Thomas graces us with this patch that resolves a -+ type-size inconsistency in the UIDVALIDITY parser. -+ -+ Edited for correctness. -+ -+2005-03-17 09:30:06 Pawel Dziekonski (roessler) -+ -+ * po/pl.po: update -+ -+2005-03-16 07:01:59 Brendan Cully (brendan) -+ -+ * doc/Makefile.in: As Ralf Wildenhues noted, the cygwin EXEEXT -+ patch was incomplete. Note to self: avoid patching on short -+ sleep. Starting tomorrow. -+ -+2005-03-16 02:49:33 Brendan Cully (brendan) -+ -+ * configure.in, doc/Makefile.in, hcache.c, Makefile.am: Various -+ cygwin portability fixes -+ -+2005-03-15 04:40:40 Brendan Cully (brendan) -+ -+ * crypthash.h: Don't define uint32_t anywhere but in -+ config.h. Spotted by Alain Bench. -+ -+2005-03-13 16:35:35 roessler (roessler) -+ -+ * po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, -+ po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, -+ po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, VERSION, po/bg.po, -+ po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, -+ po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, reldate.h: -+ automatic post-release commit for mutt-1.5.9 -+ - 2005-03-13 16:29:09 Morten Bo Johansen (roessler) - - * po/da.po: update -@@ -330,7 +405,7 @@ - 2005-01-29 19:15:07 Thomas Glanzmann (roessler) - - * hcache.c: - make hcache.c conform to mutt codingstyle -- - use $Id: ChangeLog,v 3.406 2005/03/13 16:29:39 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword -+ - use $Id: ChangeLog,v 3.420 2005/04/03 00:15:36 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword - - 2005-01-29 19:15:07 Thomas Glanzmann (roessler) - -Index: mutt/Makefile.am -=================================================================== -RCS file: /home/roessler/cvs/mutt/Makefile.am,v -retrieving revision 3.32 -retrieving revision 3.34 -diff -u -p -r3.32 -r3.34 ---- mutt/Makefile.am 13 Feb 2005 09:53:07 -0000 3.32 -+++ mutt/Makefile.am 22 Mar 2005 19:58:15 -0000 3.34 -@@ -2,7 +2,7 @@ - ## Use aclocal -I m4; automake --foreign - - AUTOMAKE_OPTIONS = 1.6 foreign --EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc -+EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap makedoc - - if BUILD_IMAP - IMAP_SUBDIR = imap -@@ -127,7 +127,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)/mutt_dotlock ; then \ - rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ - ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ -Index: mutt/configure.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/configure.in,v -retrieving revision 3.24 -retrieving revision 3.25 -diff -u -p -r3.24 -r3.25 ---- mutt/configure.in 13 Feb 2005 00:25:37 -0000 3.24 -+++ mutt/configure.in 16 Mar 2005 02:49:33 -0000 3.25 -@@ -129,7 +129,7 @@ else - if test x$have_pgp != xno ; then - AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, - [ Define if you want classic PGP support. ]) -- PGPAUX_TARGET="pgpring pgpewrap" -+ PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" - fi - -Index: mutt/crypthash.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypthash.h,v -retrieving revision 3.2 -retrieving revision 3.3 -diff -u -p -r3.2 -r3.3 ---- mutt/crypthash.h 5 Feb 2005 14:11:36 -0000 3.2 -+++ mutt/crypthash.h 15 Mar 2005 04:40:40 -0000 3.3 -@@ -14,12 +14,4 @@ - /* POINTER defines a generic pointer type */ - typedef unsigned char *POINTER; - --# ifndef HAVE_UINT32_T --# if SIZEOF_INT == 4 --typedef unsigned int uint32_t; --# elif SIZEOF_LONG == 4 --typedef unsigned long uint32_t; --# endif --# endif -- - #endif -Index: mutt/hcache.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/hcache.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -r3.4 -r3.6 ---- mutt/hcache.c 3 Feb 2005 19:46:53 -0000 3.4 -+++ mutt/hcache.c 22 Mar 2005 03:40:54 -0000 3.6 -@@ -30,6 +30,9 @@ - - #include - #include -+#if HAVE_SYS_TIME_H -+#include -+#endif - #include "mutt.h" - #ifdef USE_IMAP - #include "message.h" -@@ -60,7 +63,7 @@ static struct header_cache - typedef union - { - struct timeval timeval; -- uint64_t uid_validity; -+ unsigned long uid_validity; - } validate; - - static void * -@@ -447,7 +450,7 @@ generate_crc32() - SPAM_LIST *sp = SpamList; - RX_LIST *rx = NoSpamList; - -- crc = crc32(crc, (unsigned char const *) "$Id: hcache.c,v 3.4 2005/02/03 19:46:53 roessler Exp $", mutt_strlen("$Id: hcache.c,v 3.4 2005/02/03 19:46:53 roessler Exp $")); -+ crc = crc32(crc, (unsigned char const *) "$Id: hcache.c,v 3.6 2005/03/22 03:40:54 brendan Exp $", mutt_strlen("$Id: hcache.c,v 3.6 2005/03/22 03:40:54 brendan Exp $")); - - #if HAVE_LANGINFO_CODESET - crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset)); -@@ -547,7 +550,7 @@ mutt_hcache_per_folder(const char *path, - * db_store */ - static void * - mutt_hcache_dump(void *_db, HEADER * h, int *off, -- uint64_t uid_validity) -+ unsigned long uid_validity) - { - struct header_cache *db = _db; - unsigned char *d = NULL; -@@ -556,7 +559,7 @@ mutt_hcache_dump(void *_db, HEADER * h, - d = lazy_malloc(sizeof (validate)); - - if (uid_validity) -- memcpy(d, &uid_validity, sizeof (uint64_t)); -+ memcpy(d, &uid_validity, sizeof (unsigned long)); - else - { - struct timeval now; -@@ -693,7 +696,7 @@ mutt_hcache_fetch(void *db, const char * - - int - mutt_hcache_store(void *db, const char *filename, HEADER * header, -- uint64_t uid_validity, -+ unsigned long uid_validity, - size_t(*keylen) (const char *fn)) - { - struct header_cache *h = db; -@@ -883,7 +886,7 @@ mutt_hcache_fetch(void *db, const char * - - int - mutt_hcache_store(void *db, const char *filename, HEADER * header, -- uint64_t uid_validity, -+ unsigned long uid_validity, - size_t(*keylen) (const char *fn)) - { - DBT key; -Index: mutt/init.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/init.c,v -retrieving revision 3.30 -retrieving revision 3.31 -diff -u -p -r3.30 -r3.31 ---- mutt/init.c 12 Feb 2005 19:12:40 -0000 3.30 -+++ mutt/init.c 22 Mar 2005 19:46:59 -0000 3.31 -@@ -585,42 +585,6 @@ static int parse_list (BUFFER *buf, BUFF - return 0; - } - --static int _parse_rx_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err, int flags) --{ -- do -- { -- mutt_extract_token (buf, s, 0); -- if (add_to_rx_list ((RX_LIST **) data, buf->data, flags, err) != 0) -- return -1; -- -- } -- while (MoreArgs (s)); -- -- return 0; --} -- --static int parse_rx_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) --{ -- return _parse_rx_list (buf, s, data, err, REG_ICASE); --} -- --static int parse_rx_unlist (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) --{ -- do -- { -- mutt_extract_token (buf, s, 0); -- if (mutt_strcmp (buf->data, "*") == 0) -- { -- mutt_free_rx_list ((RX_LIST **) data); -- break; -- } -- remove_from_rx_list ((RX_LIST **) data, buf->data); -- } -- while (MoreArgs (s)); -- -- return 0; --} -- - static void _alternates_clean (void) - { - int i; -Index: mutt/init.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/init.h,v -retrieving revision 3.68 -retrieving revision 3.70 -diff -u -p -r3.68 -r3.70 ---- mutt/init.h 1 Mar 2005 15:52:33 -0000 3.68 -+++ mutt/init.h 23 Mar 2005 10:51:11 -0000 3.70 -@@ -1032,6 +1032,13 @@ struct option_t MuttVars[] = { - ** be a single global header cache. By default it is unset and so no - ** header caching will be used. - */ -+ { "maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1 }, -+ /* -+ ** .pp -+ ** Check for Maildir unaware programs other than mutt having modified maildir -+ ** files when the header cache is in use. This incurs one stat(2) per -+ ** message every time the folder is opened. -+ */ - { "header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384" }, - /* - ** .pp -@@ -2885,10 +2892,8 @@ const struct mapping_t SortKeyMethods[] - /* functions used to parse commands in a rc file */ - - static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); --static int parse_rx_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); --static int parse_rx_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); - - static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); - static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); -Index: mutt/mh.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mh.c,v -retrieving revision 3.23 -retrieving revision 3.25 -diff -u -p -r3.23 -r3.25 ---- mutt/mh.c 3 Feb 2005 17:01:43 -0000 3.23 -+++ mutt/mh.c 31 Mar 2005 04:55:09 -0000 3.25 -@@ -47,6 +47,10 @@ - #include - #include - -+#if HAVE_SYS_TIME_H -+#include -+#endif -+ - struct maildir - { - HEADER *h; -@@ -791,6 +795,14 @@ static int maildir_move_to_context (CONT - return r; - } - -+#if USE_HCACHE -+static size_t maildir_hcache_keylen (const char *fn) -+{ -+ const char * p = strrchr (fn, ':'); -+ return p ? (size_t) (p - fn) : mutt_strlen(fn); -+} -+#endif -+ - #ifdef USE_INODESORT - /* - * Merge two maildir lists according to the inode numbers. -@@ -886,27 +898,67 @@ static struct maildir* maildir_sort_inod - * This function does the second parsing pass for a maildir-style - * folder. - */ -- - void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md) - { - struct maildir *p; - char fn[_POSIX_PATH_MAX]; - int count; - -+#if USE_HCACHE -+ void *hc = NULL; -+ void *data; -+ struct timeval *when = NULL; -+ struct stat lastchanged; -+ int ret; -+ -+ hc = mutt_hcache_open (HeaderCache, ctx->path); -+#endif -+ - for (p = md, count = 0; p; p = p->next, count++) -- if (p && p->h && !p->header_parsed) -- { -- if (!ctx->quiet && ReadInc && ((count % ReadInc) == 0 || count == 1)) -- mutt_message (_("Reading %s... %d"), ctx->path, count); -- snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); -- if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) -- p->header_parsed = 1; -- else -- mutt_free_header (&p->h); -- } --} -+ { -+ if (! (p && p->h && !p->header_parsed)) -+ continue; - -+ if (!ctx->quiet && ReadInc && ((count % ReadInc) == 0 || count == 1)) -+ mutt_message (_("Reading %s... %d"), ctx->path, count); - -+#if USE_HCACHE -+ data = mutt_hcache_fetch (hc, p->h->path + 3, &maildir_hcache_keylen); -+ when = (struct timeval *) data; -+#endif -+ -+ snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); -+ -+#if USE_HCACHE -+ if (option(OPTHCACHEVERIFY)) -+ ret = stat(fn, &lastchanged); -+ else { -+ lastchanged.st_mtime = 0; -+ ret = 0; -+ } -+ -+ if (data != NULL && !ret && lastchanged.st_mtime <= when->tv_sec) -+ { -+ p->h = mutt_hcache_restore ((unsigned char *)data, &p->h); -+ maildir_parse_flags (p->h, fn); -+ } else -+#endif -+ if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) -+ { -+ p->header_parsed = 1; -+#if USE_HCACHE -+ mutt_hcache_store (hc, p->h->path + 3, p->h, 0, &maildir_hcache_keylen); -+#endif -+ } else -+ mutt_free_header (&p->h); -+#if USE_HCACHE -+ FREE(&data); -+#endif -+ } -+#if USE_HCACHE -+ mutt_hcache_close (hc); -+#endif -+} - - /* Read a MH/maildir style mailbox. - * -@@ -1403,6 +1455,9 @@ int mh_sync_mailbox (CONTEXT * ctx, int - { - char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX]; - int i, j; -+#if USE_HCACHE -+ void *hc = NULL; -+#endif /* USE_HCACHE */ - - if (ctx->magic == M_MH) - i = mh_check_mailbox (ctx, index_hint); -@@ -1412,6 +1467,11 @@ int mh_sync_mailbox (CONTEXT * ctx, int - if (i != 0) - return i; - -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ hc = mutt_hcache_open(HeaderCache, ctx->path); -+#endif /* USE_HCACHE */ -+ - for (i = 0; i < ctx->msgcount; i++) - { - if (ctx->hdrs[i]->deleted -@@ -1420,7 +1480,13 @@ int mh_sync_mailbox (CONTEXT * ctx, int - snprintf (path, sizeof (path), "%s/%s", ctx->path, ctx->hdrs[i]->path); - if (ctx->magic == M_MAILDIR - || (option (OPTMHPURGE) && ctx->magic == M_MH)) -+ { -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ mutt_hcache_delete (hc, ctx->hdrs[i]->path + 3, &maildir_hcache_keylen); -+#endif /* USE_HCACHE */ - unlink (path); -+ } - else if (ctx->magic == M_MH) - { - /* MH just moves files out of the way when you delete them */ -@@ -1442,16 +1508,21 @@ int mh_sync_mailbox (CONTEXT * ctx, int - if (ctx->magic == M_MAILDIR) - { - if (maildir_sync_message (ctx, i) == -1) -- return -1; -+ goto err; - } - else - { - if (mh_sync_message (ctx, i) == -1) -- return -1; -+ goto err; - } - } - } - -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ mutt_hcache_close (hc); -+#endif /* USE_HCACHE */ -+ - if (ctx->magic == M_MH) - mh_update_sequences (ctx); - -@@ -1472,6 +1543,13 @@ int mh_sync_mailbox (CONTEXT * ctx, int - } - - return 0; -+ -+err: -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ mutt_hcache_close (hc); -+#endif /* USE_HCACHE */ -+ return -1; - } - - static char *maildir_canon_filename (char *dest, const char *src, size_t l) -Index: mutt/mutt.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt.h,v -retrieving revision 3.40 -retrieving revision 3.41 -diff -u -p -r3.40 -r3.41 ---- mutt/mutt.h 28 Feb 2005 15:15:23 -0000 3.40 -+++ mutt/mutt.h 23 Mar 2005 10:51:11 -0000 3.41 -@@ -351,6 +351,9 @@ enum - OPTFORCENAME, - OPTFORWDECODE, - OPTFORWQUOTE, -+#if USE_HCACHE -+ OPTHCACHEVERIFY, -+#endif - OPTHDRS, - OPTHEADER, - OPTHELP, -Index: mutt/protos.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/protos.h,v -retrieving revision 3.25 -retrieving revision 3.26 -diff -u -p -r3.25 -r3.26 ---- mutt/protos.h 1 Feb 2005 03:36:39 -0000 3.25 -+++ mutt/protos.h 22 Mar 2005 03:40:54 -0000 3.26 -@@ -111,7 +111,7 @@ void *mutt_hcache_open(const char *path, - void mutt_hcache_close(void *db); - HEADER *mutt_hcache_restore(const unsigned char *d, HEADER **oh); - void *mutt_hcache_fetch(void *db, const char *filename, size_t (*keylen)(const char *fn)); --int mutt_hcache_store(void *db, const char *filename, HEADER *h, uint64_t uid_validity, size_t (*keylen)(const char *fn)); -+int mutt_hcache_store(void *db, const char *filename, HEADER *h, unsigned long uid_validity, size_t (*keylen)(const char *fn)); - int mutt_hcache_delete(void *db, const char *filename, size_t (*keylen)(const char *fn)); - #endif /* USE_HCACHE */ - -Index: mutt/doc/Makefile.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/Makefile.in,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -r3.5 -r3.7 ---- mutt/doc/Makefile.in 15 Feb 2005 19:28:24 -0000 3.5 -+++ mutt/doc/Makefile.in 16 Mar 2005 07:01:59 -0000 3.7 -@@ -1,4 +1,4 @@ --# $Id: Makefile.in,v 3.5 2005/02/15 19:28:24 roessler Exp $ -+# $Id: Makefile.in,v 3.7 2005/03/16 07:01:59 brendan Exp $ - - SHELL = /bin/sh - -@@ -21,6 +21,7 @@ VPATH = @srcdir@ - INSTALL = @INSTALL@ - CC = @CC@ - CPP = @CPP@ -+EXEEXT = @EXEEXT@ - XCPPFLAGS = -I. @CPPFLAGS@ - CFLAGS = @CFLAGS@ $(XCPPFLAGS) - LDFLAGS = @LDFLAGS@ -@@ -65,10 +66,10 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA - - all: muttrc.man try-html try-txt - --try-html: ../makedoc -+try-html: ../makedoc$(EXEEXT) - test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ - --try-txt: ../makedoc -+try-txt: ../makedoc$(EXEEXT) - test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ - - install: all instdoc -@@ -149,21 +150,21 @@ dist distdir: Makefile $(DISTFILES) - || cp -p $$file $(distdir) ; \ - done - --../makedoc: $(top_srcdir)/makedoc.c -- (cd .. && $(MAKE) makedoc) -+../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c -+ (cd .. && $(MAKE) makedoc$(EXEEXT)) - - # hack around autoconf mixing up patterns. - at = @ - --update-doc: ../makedoc stamp-doc-sgml stamp-doc-man manual.txt manual.html -+update-doc: ../makedoc$(EXEEXT) stamp-doc-sgml stamp-doc-man manual.txt manual.html - --muttrc.man stamp-doc-man: ../makedoc $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail -+muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail - $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \ - cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\ - > muttrc.man - touch stamp-doc-man - --manual.sgml stamp-doc-sgml: ../makedoc $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION -+manual.sgml stamp-doc-sgml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION - ( sed -e "s/$(at)VERSION$(at)/`cat $(top_srcdir)/VERSION`/" $(srcdir)/manual.sgml.head ;\ - $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) | \ - cat - $(srcdir)/manual.sgml.tail > manual.sgml -Index: mutt/imap/imap.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap.c,v -retrieving revision 3.21 -retrieving revision 3.23 -diff -u -p -r3.21 -r3.23 ---- mutt/imap/imap.c 17 Feb 2005 03:33:00 -0000 3.21 -+++ mutt/imap/imap.c 3 Apr 2005 00:14:51 -0000 3.23 -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 1996-8 Michael R. Elkins - * Copyright (C) 1996-9 Brandon Long -- * Copyright (C) 1999-2003 Brendan Cully -+ * Copyright (C) 1999-2005 Brendan Cully - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -635,7 +635,7 @@ int imap_open_mailbox (CONTEXT* ctx) - dprint(2, (debugfile, "Getting mailbox UIDVALIDITY\n")); - pc += 3; - pc = imap_next_word(pc); -- sscanf(pc, "%u", &(idata->uid_validity)); -+ sscanf(pc, "%lu", &(idata->uid_validity)); - } - #endif - else -@@ -921,6 +921,76 @@ int imap_make_msg_set (IMAP_DATA* idata, - return count; - } - -+/* Update the IMAP server to reflect the flags a single message. */ -+ -+int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd, -+ int *err_continue) -+{ -+ char flags[LONG_STRING]; -+ char uid[11]; -+ -+ hdr->changed = 0; -+ -+ snprintf (uid, sizeof (uid), "%u", HEADER_DATA(hdr)->uid); -+ cmd->dptr = cmd->data; -+ mutt_buffer_addstr (cmd, "UID STORE "); -+ mutt_buffer_addstr (cmd, uid); -+ -+ flags[0] = '\0'; -+ -+ imap_set_flag (idata, IMAP_ACL_SEEN, hdr->read, "\\Seen ", -+ flags, sizeof (flags)); -+ imap_set_flag (idata, IMAP_ACL_WRITE, hdr->flagged, -+ "\\Flagged ", flags, sizeof (flags)); -+ imap_set_flag (idata, IMAP_ACL_WRITE, hdr->replied, -+ "\\Answered ", flags, sizeof (flags)); -+ imap_set_flag (idata, IMAP_ACL_DELETE, hdr->deleted, -+ "\\Deleted ", flags, sizeof (flags)); -+ -+ /* now make sure we don't lose custom tags */ -+ if (mutt_bit_isset (idata->rights, IMAP_ACL_WRITE)) -+ imap_add_keywords (flags, hdr, idata->flags, sizeof (flags)); -+ -+ mutt_remove_trailing_ws (flags); -+ -+ /* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to -+ * explicitly revoke all system flags (if we have permission) */ -+ if (!*flags) -+ { -+ imap_set_flag (idata, IMAP_ACL_SEEN, 1, "\\Seen ", flags, sizeof (flags)); -+ imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Flagged ", flags, sizeof (flags)); -+ imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags)); -+ imap_set_flag (idata, IMAP_ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags)); -+ -+ mutt_remove_trailing_ws (flags); -+ -+ mutt_buffer_addstr (cmd, " -FLAGS.SILENT ("); -+ } else -+ mutt_buffer_addstr (cmd, " FLAGS.SILENT ("); -+ -+ mutt_buffer_addstr (cmd, flags); -+ mutt_buffer_addstr (cmd, ")"); -+ -+ /* dumb hack for bad UW-IMAP 4.7 servers spurious FLAGS updates */ -+ hdr->active = 0; -+ -+ /* after all this it's still possible to have no flags, if you -+ * have no ACL rights */ -+ if (*flags && (imap_exec (idata, cmd->data, 0) != 0) && -+ err_continue && (*err_continue != M_YES)) -+ { -+ *err_continue = imap_continue ("imap_sync_message: STORE failed", -+ idata->cmd.buf); -+ if (*err_continue != M_YES) -+ return -1; -+ } -+ -+ hdr->active = 1; -+ idata->ctx->changed--; -+ -+ return 0; -+} -+ - /* update the IMAP server to reflect message changes done within mutt. - * Arguments - * ctx: the current context -@@ -932,12 +1002,10 @@ int imap_sync_mailbox (CONTEXT* ctx, int - IMAP_DATA* idata; - CONTEXT* appendctx = NULL; - BUFFER cmd; -- char flags[LONG_STRING]; -- char uid[11]; - int deleted; - int n; -- int err_continue = M_NO; /* continue on error? */ - int rc; -+ int err_continue = M_NO; /* continue on error? */ - - idata = (IMAP_DATA*) ctx->data; - -@@ -994,16 +1062,9 @@ int imap_sync_mailbox (CONTEXT* ctx, int - { - if (ctx->hdrs[n]->active && ctx->hdrs[n]->changed) - { -- ctx->hdrs[n]->changed = 0; -- - mutt_message (_("Saving message status flags... [%d/%d]"), n+1, - ctx->msgcount); - -- snprintf (uid, sizeof (uid), "%u", HEADER_DATA(ctx->hdrs[n])->uid); -- cmd.dptr = cmd.data; -- mutt_buffer_addstr (&cmd, "UID STORE "); -- mutt_buffer_addstr (&cmd, uid); -- - /* if attachments have been deleted we delete the message and reupload - * it. This works better if we're expunging, of course. */ - if (ctx->hdrs[n]->attach_del) -@@ -1018,60 +1079,12 @@ int imap_sync_mailbox (CONTEXT* ctx, int - else - _mutt_save_message (ctx->hdrs[n], appendctx, 1, 0, 0); - } -- flags[0] = '\0'; -- -- imap_set_flag (idata, IMAP_ACL_SEEN, ctx->hdrs[n]->read, "\\Seen ", -- flags, sizeof (flags)); -- imap_set_flag (idata, IMAP_ACL_WRITE, ctx->hdrs[n]->flagged, -- "\\Flagged ", flags, sizeof (flags)); -- imap_set_flag (idata, IMAP_ACL_WRITE, ctx->hdrs[n]->replied, -- "\\Answered ", flags, sizeof (flags)); -- imap_set_flag (idata, IMAP_ACL_DELETE, ctx->hdrs[n]->deleted, -- "\\Deleted ", flags, sizeof (flags)); -- -- /* now make sure we don't lose custom tags */ -- if (mutt_bit_isset (idata->rights, IMAP_ACL_WRITE)) -- imap_add_keywords (flags, ctx->hdrs[n], idata->flags, sizeof (flags)); -- -- mutt_remove_trailing_ws (flags); -- -- /* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to -- * explicitly revoke all system flags (if we have permission) */ -- if (!*flags) -- { -- imap_set_flag (idata, IMAP_ACL_SEEN, 1, "\\Seen ", flags, sizeof (flags)); -- imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Flagged ", flags, sizeof (flags)); -- imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags)); -- imap_set_flag (idata, IMAP_ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags)); -- -- mutt_remove_trailing_ws (flags); -- -- mutt_buffer_addstr (&cmd, " -FLAGS.SILENT ("); -- } -- else -- mutt_buffer_addstr (&cmd, " FLAGS.SILENT ("); -- -- mutt_buffer_addstr (&cmd, flags); -- mutt_buffer_addstr (&cmd, ")"); - -- /* dumb hack for bad UW-IMAP 4.7 servers spurious FLAGS updates */ -- ctx->hdrs[n]->active = 0; -- -- /* after all this it's still possible to have no flags, if you -- * have no ACL rights */ -- if (*flags && (imap_exec (idata, cmd.data, 0) != 0) && -- (err_continue != M_YES)) -+ if (imap_sync_message (idata, ctx->hdrs[n], &cmd, &err_continue) < 0) - { -- err_continue = imap_continue ("imap_sync_mailbox: STORE failed", -- idata->cmd.buf); -- if (err_continue != M_YES) -- { -- rc = -1; -- goto out; -- } -+ rc = -1; -+ goto out; - } -- -- ctx->hdrs[n]->active = 1; - } - } - ctx->changed = 0; -Index: mutt/imap/imap_private.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap_private.h,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -r3.5 -r3.7 ---- mutt/imap/imap_private.h 17 Feb 2005 03:33:00 -0000 3.5 -+++ mutt/imap/imap_private.h 3 Apr 2005 00:14:51 -0000 3.7 -@@ -180,7 +180,7 @@ typedef struct - IMAP_CACHE cache[IMAP_CACHE_LEN]; - unsigned int noclose : 1; - #ifdef USE_HCACHE -- uint64_t uid_validity; -+ unsigned long uid_validity; - #endif - - /* all folder flags - system flags AND keywords */ -@@ -203,6 +203,8 @@ int imap_parse_list_response(IMAP_DATA* - int imap_read_literal (FILE* fp, IMAP_DATA* idata, long bytes); - void imap_expunge_mailbox (IMAP_DATA* idata); - void imap_logout (IMAP_DATA* idata); -+int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd, -+ int *err_continue); - - /* auth.c */ - int imap_authenticate (IMAP_DATA* idata); -Index: mutt/imap/message.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/message.c,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -r3.19 -r3.21 ---- mutt/imap/message.c 27 Feb 2005 03:18:23 -0000 3.19 -+++ mutt/imap/message.c 3 Apr 2005 00:14:51 -0000 3.21 -@@ -69,7 +69,7 @@ int imap_read_headers (IMAP_DATA* idata, - - #if USE_HCACHE - void *hc = NULL; -- uint64_t *uid_validity = NULL; -+ unsigned long *uid_validity = NULL; - char uid_buf[64]; - #endif /* USE_HCACHE */ - -@@ -154,7 +154,7 @@ int imap_read_headers (IMAP_DATA* idata, - fputs ("\n\n", fp); - - sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */ -- uid_validity = (uint64_t *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen); -+ uid_validity = (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen); - - if (uid_validity != NULL - && *uid_validity == idata->uid_validity) { -@@ -640,13 +640,14 @@ int imap_append_message (CONTEXT *ctx, M - int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) - { - IMAP_DATA* idata; -- BUFFER cmd; -+ BUFFER cmd, sync_cmd; - char uid[11]; - char mbox[LONG_STRING]; - char mmbox[LONG_STRING]; - int rc; - int n; - IMAP_MBOX mx; -+ int err_continue = M_NO; - - idata = (IMAP_DATA*) ctx->data; - -@@ -672,6 +673,7 @@ int imap_copy_messages (CONTEXT* ctx, HE - - imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox)); - -+ memset (&sync_cmd, 0, sizeof (sync_cmd)); - memset (&cmd, 0, sizeof (cmd)); - mutt_buffer_addstr (&cmd, "UID COPY "); - -@@ -688,6 +690,17 @@ int imap_copy_messages (CONTEXT* ctx, HE - dprint (3, (debugfile, "imap_copy_messages: Message contains attachments to be deleted\n")); - return 1; - } -+ -+ if (ctx->hdrs[n]->tagged && ctx->hdrs[n]->active && -+ ctx->hdrs[n]->changed) -+ { -+ rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue); -+ if (rc < 0) -+ { -+ dprint (1, (debugfile, "imap_copy_messages: could not sync\n")); -+ goto fail; -+ } -+ } - } - - rc = imap_make_msg_set (idata, &cmd, M_TAG, 0); -@@ -703,6 +716,16 @@ int imap_copy_messages (CONTEXT* ctx, HE - mutt_message (_("Copying message %d to %s..."), h->index+1, mbox); - snprintf (uid, sizeof (uid), "%u", HEADER_DATA (h)->uid); - mutt_buffer_addstr (&cmd, uid); -+ -+ if (h->active && h->changed) -+ { -+ rc = imap_sync_message (idata, h, &sync_cmd, &err_continue); -+ if (rc < 0) -+ { -+ dprint (1, (debugfile, "imap_copy_messages: could not sync\n")); -+ goto fail; -+ } -+ } - } - - /* let's get it on */ -@@ -761,12 +784,16 @@ int imap_copy_messages (CONTEXT* ctx, HE - - if (cmd.data) - FREE (&cmd.data); -+ if (sync_cmd.data) -+ FREE (&sync_cmd.data); - FREE (&mx.mbox); - return 0; - - fail: - if (cmd.data) - FREE (&cmd.data); -+ if (sync_cmd.data) -+ FREE (&sync_cmd.data); - FREE (&mx.mbox); - return -1; - } -@@ -923,7 +950,6 @@ static size_t imap_hcache_keylen (const - static int msg_fetch_header_fetch (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp) - { - IMAP_DATA* idata; -- long bytes; - int rc = -1; /* default now is that string isn't FETCH response*/ - - idata = (IMAP_DATA*) ctx->data; -Index: mutt/po/de.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/de.po,v -retrieving revision 3.22 -retrieving revision 3.23 -diff -u -p -r3.22 -r3.23 ---- mutt/po/de.po 13 Mar 2005 16:35:33 -0000 3.22 -+++ mutt/po/de.po 22 Mar 2005 19:48:35 -0000 3.23 -@@ -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-03-13 17:38+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 \n" - "Language-Team: German \n" - "MIME-Version: 1.0\n" -@@ -204,9 +204,8 @@ msgid "Create is only supported for IMAP - 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" -Index: mutt/po/id.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/id.po,v -retrieving revision 3.21 -retrieving revision 3.22 -diff -u -p -r3.21 -r3.22 ---- mutt/po/id.po 13 Mar 2005 16:35:34 -0000 3.21 -+++ mutt/po/id.po 22 Mar 2005 19:53:49 -0000 3.22 -@@ -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 \n" - "Language-Team: Indonesia \n" - "MIME-Version: 1.0\n" -@@ -207,9 +207,8 @@ msgid "Create is only supported for IMAP - 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 - - #: 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 s - - #: 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 d - - #: 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 - - #: 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 penekana - - #: 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." -Index: mutt/po/nl.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/nl.po,v -retrieving revision 3.22 -retrieving revision 3.23 -diff -u -p -r3.22 -r3.23 ---- mutt/po/nl.po 13 Mar 2005 16:35:34 -0000 3.22 -+++ mutt/po/nl.po 22 Mar 2005 19:49:31 -0000 3.23 -@@ -1,10 +1,10 @@ --# $Id: nl.po,v 3.21 2005/02/12 20:56:33 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 \n" - "Language-Team: René Clerc \n" - "MIME-Version: 1.0\n" -@@ -203,9 +203,8 @@ msgid "Create is only supported for IMAP - 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 ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -2653,18 +2649,18 @@ msgstr "" - " -e \tspecificeer een uit te voeren opdracht na initialisatie\n" - " -f \tspecificeer de te lezen mailfolder\n" - " -F \tspecificeer een alternatieve muttrc\n" --" -H \tspecificeer een een bestand om de headers uit te lezen\n" -+" -H \tspecificeer een bestand om de headers uit te lezen\n" - " -i \tspecificeer een bestand dat Mutt moet bijsluiten in het " --"antwoord\n" -+"bericht\n" - " -m \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 \tvraagt de waarde van een configuratievariabele op\n" - " -R\t\topent de mailfolder met alleen-lezen rechten\n" - " -s \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 " -Index: mutt/po/pl.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/pl.po,v -retrieving revision 3.24 -retrieving revision 3.25 -diff -u -p -r3.24 -r3.25 ---- mutt/po/pl.po 13 Mar 2005 16:35:34 -0000 3.24 -+++ mutt/po/pl.po 17 Mar 2005 09:30:06 -0000 3.25 -@@ -6,10 +6,10 @@ - # get your own copy of PePeSza from http://www.ids.pl/~pkollegu/pepesza.html - msgid "" - msgstr "" --"Project-Id-Version: mutt-cvs-2004.08.16\n" -+"Project-Id-Version: mutt-1.5.8\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2005-03-13 17:38+0100\n" --"PO-Revision-Date: 2004-08-16\n" -+"POT-Creation-Date: 2005-02-15 13:41+0100\n" -+"PO-Revision-Date: 2005-02-15\n" - "Last-Translator: Pawe³ Dziekoñski \n" - "Language-Team: POLISH \n" - "MIME-Version: 1.0\n" -@@ -175,7 +175,7 @@ msgstr "Zmieñ katalog" - msgid "Mask" - msgstr "Wzorzec" - --#: browser.c:381 browser.c:989 -+#: browser.c:381 browser.c:968 - #, c-format - msgid "%s is not a directory." - msgstr "%s nie jest katalogiem." -@@ -199,7 +199,7 @@ msgstr "Katalog [%s], wzorzec nazw plikó - msgid "Can't attach a directory!" - msgstr "Za³±cznikiem nie mo¿e zostaæ katalog!" - --#: browser.c:655 browser.c:1056 browser.c:1153 -+#: browser.c:655 browser.c:1035 browser.c:1132 - msgid "No files match the file mask" - msgstr "¯aden plik nie pasuje do wzorca" - -@@ -208,60 +208,55 @@ msgid "Create is only supported for IMAP - msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP" - - #: browser.c:880 --#, fuzzy --msgid "Rename is only supported for IMAP mailboxes" --msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP" -- --#: browser.c:901 - msgid "Delete is only supported for IMAP mailboxes" - msgstr "Usuwanie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP" - --#: browser.c:909 -+#: browser.c:888 - #, c-format - msgid "Really delete mailbox \"%s\"?" - msgstr "Naprawdê usun±æ skrzynkê \"%s\"?" - --#: browser.c:923 -+#: browser.c:902 - msgid "Mailbox deleted." - msgstr "Skrzynka zosta³a usuniêta." - --#: browser.c:929 -+#: browser.c:908 - msgid "Mailbox not deleted." - msgstr "Skrzynka nie zosta³a usuniêta." - --#: browser.c:948 -+#: browser.c:927 - msgid "Chdir to: " - msgstr "Zmieñ katalog na: " - --#: browser.c:977 browser.c:1049 -+#: browser.c:956 browser.c:1028 - msgid "Error scanning directory." - msgstr "B³±d przegl±dania katalogu." - --#: browser.c:1000 -+#: browser.c:979 - msgid "File Mask: " - msgstr "Wzorzec nazw plików: " - --#: browser.c:1072 -+#: browser.c:1051 - msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " - msgstr "Sortowanie odwrotne wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?" - --#: browser.c:1073 -+#: browser.c:1052 - msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " - msgstr "Sortowanie wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?" - --#: browser.c:1074 -+#: browser.c:1053 - msgid "dazn" - msgstr "dawn" - --#: browser.c:1140 -+#: browser.c:1119 - msgid "New file name: " - msgstr "Nazwa nowego pliku: " - --#: browser.c:1171 -+#: browser.c:1150 - msgid "Can't view a directory" - msgstr "Nie mo¿na przegl±daæ tego katalogu" - --#: browser.c:1188 -+#: browser.c:1167 - msgid "Error trying to view file" - msgstr "B³±d podczas próby przegl±dania pliku" - -@@ -448,19 +443,12 @@ msgid "Messages could not be printed" - msgstr "Listy nie zosta³y wydrukowane" - - #: commands.c:508 --msgid "" --"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s" --"(p)am?: " --msgstr "" --"Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)" --"pam?: " -+msgid "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: " -+msgstr "Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: " - - #: commands.c:509 --msgid "" --"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)" --"am?: " --msgstr "" --"Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: " -+msgid "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: " -+msgstr "Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: " - - #: commands.c:510 - msgid "dfrsotuzcp" -@@ -746,68 +734,44 @@ msgstr "Nie mo¿na wys³aæ listu w trybie - msgid "Mail not sent." - msgstr "List nie zosta³ wys³any." - --#: crypt.c:398 -+#: crypt.c:395 - msgid "S/MIME messages with no hints on content are unsupported." - msgstr "Listy S/MIME bez wskazówek co do zawarto¶ci nie s± obs³ugiwane." - --#: crypt.c:617 crypt.c:661 -+#: crypt.c:614 crypt.c:658 - msgid "Trying to extract PGP keys...\n" - msgstr "Próba skopiowania kluczy PGP...\n" - --#: crypt.c:641 crypt.c:681 -+#: crypt.c:638 crypt.c:678 - msgid "Trying to extract S/MIME certificates...\n" - msgstr "Próba skopiowania kluczy S/MIME...\n" - --#: crypt.c:802 --msgid "" --"[-- Error: Inconsistent multipart/signed structure! --]\n" --"\n" --msgstr "" --"[-- B³±d: Niespójna struktura multipart/signed ! --]\n" --"\n" -- --#: crypt.c:824 --#, c-format --msgid "" --"[-- Error: Unknown multipart/signed protocol %s! --]\n" --"\n" --msgstr "" --"[-- B³±d: Nieznany protokó³ multipart/signed %s! --]\n" --"\n" -- --#: crypt.c:864 --#, c-format --msgid "" --"[-- Warning: We can't verify %s/%s signatures. --]\n" --"\n" --msgstr "" --"[-- Ostrze¿enie: nie mo¿na zweryfikowaæ podpisów %s/%s --]\n" --"\n" -+#: crypt.c:799 -+msgid "[-- Error: Inconsistent multipart/signed structure! --]\n\n" -+msgstr "[-- B³±d: Niespójna struktura multipart/signed ! --]\n\n" -+ -+#: crypt.c:821 -+#, c-format -+msgid "[-- Error: Unknown multipart/signed protocol %s! --]\n\n" -+msgstr "[-- B³±d: Nieznany protokó³ multipart/signed %s! --]\n\n" -+ -+#: crypt.c:861 -+#, c-format -+msgid "[-- Warning: We can't verify %s/%s signatures. --]\n\n" -+msgstr "[-- Ostrze¿enie: nie mo¿na zweryfikowaæ podpisów %s/%s --]\n\n" - - #. Now display the signed body --#: crypt.c:876 --msgid "" --"[-- The following data is signed --]\n" --"\n" --msgstr "" --"[-- Poni¿sze dane s± podpisane --]\n" --"\n" -- --#: crypt.c:882 --msgid "" --"[-- Warning: Can't find any signatures. --]\n" --"\n" --msgstr "" --"[-- Ostrze¿enie: Nie znaleziono ¿adnych podpisów. --]\n" --"\n" -- --#: crypt.c:888 --msgid "" --"\n" --"[-- End of signed data --]\n" --msgstr "" --"\n" --"[-- Koniec podpisanych danych --]\n" -+#: crypt.c:873 -+msgid "[-- The following data is signed --]\n\n" -+msgstr "[-- Poni¿sze dane s± podpisane --]\n\n" -+ -+#: crypt.c:879 -+msgid "[-- Warning: Can't find any signatures. --]\n\n" -+msgstr "[-- Ostrze¿enie: Nie znaleziono ¿adnych podpisów. --]\n\n" -+ -+#: crypt.c:885 -+msgid "\n[-- End of signed data --]\n" -+msgstr "\n[-- Koniec podpisanych danych --]\n" - - #: curs_lib.c:190 - msgid "yes" -@@ -902,7 +866,7 @@ msgstr "Skrzynka zosta³a zmodyfikowana z - msgid "No tagged messages." - msgstr "Brak zaznaczonych listów." - --#: curs_main.c:657 menu.c:906 -+#: curs_main.c:657 menu.c:901 - msgid "Nothing to do." - msgstr "Brak akcji do wykonania." - -@@ -1035,44 +999,8 @@ msgstr "Nie mo¿na edytowaæ listów na ser - #. * declared "static" (sigh) - #. - #: edit.c:41 --msgid "" --"~~\t\tinsert a line begining with a single ~\n" --"~b users\tadd users to the Bcc: field\n" --"~c users\tadd users to the Cc: field\n" --"~f messages\tinclude messages\n" --"~F messages\tsame as ~f, except also include headers\n" --"~h\t\tedit the message header\n" --"~m messages\tinclude and quote messages\n" --"~M messages\tsame as ~m, except include headers\n" --"~p\t\tprint the message\n" --"~q\t\twrite file and quit editor\n" --"~r file\t\tread a file into the editor\n" --"~t users\tadd users to the To: field\n" --"~u\t\trecall the previous line\n" --"~v\t\tedit message with the $visual editor\n" --"~w file\t\twrite message to file\n" --"~x\t\tabort changes and quit editor\n" --"~?\t\tthis message\n" --".\t\ton a line by itself ends input\n" --msgstr "" --"~~\t\twstaw liniê zaczynaj±c± siê pojedyñczym ~\n" --"~b u¿ytkownicy\tdodaj u¿ytkowników do pola BCC:\n" --"~c u¿ytkownicy\tdodaj u¿ytkowników do pola Cc:\n" --"~f listy\tdo³±cz listy\n" --"~F listy\tto samo co ~f ale do³±cz te¿ nag³ówki\n" --"~h\t\tedytuj nag³ówki\n" --"~m listy\tdodaj i komentuj listy\n" --"~M listy\tto samo co ~m ale do³±cz te¿ nag³ówki\n" --"~p\t\tdrukuj list\n" --"~q\t\tzapisz plik i wyjd¼ z edytora\n" --"~r plik\t\twczytaj plik do edytora\n" --"~t u¿ytkownicy\tdodaj u¿ytkowników do pola To:\n" --"~u\t\todtwórz poprzedni± liniê\n" --"~v\t\tedytuj list edytorem $visual\n" --"~w plik\t\tzapisz list do pliku\n" --"~x\t\tporzuæ zmiany i wyjd¼ z edytora\n" --"~?\t\tten list\n" --".\t\tstoj±c sama w linii koñczy wpisywanie\n" -+msgid "~~\t\tinsert a line begining with a single ~\n~b users\tadd users to the Bcc: field\n~c users\tadd users to the Cc: field\n~f messages\tinclude messages\n~F messages\tsame as ~f, except also include headers\n~h\t\tedit the message header\n~m messages\tinclude and quote messages\n~M messages\tsame as ~m, except include headers\n~p\t\tprint the message\n~q\t\twrite file and quit editor\n~r file\t\tread a file into the editor\n~t users\tadd users to the To: field\n~u\t\trecall the previous line\n~v\t\tedit message with the $visual editor\n~w file\t\twrite message to file\n~x\t\tabort changes and quit editor\n~?\t\tthis message\n.\t\ton a line by itself ends input\n" -+msgstr "~~\t\twstaw liniê zaczynaj±c± siê pojedyñczym ~\n~b u¿ytkownicy\tdodaj u¿ytkowników do pola BCC:\n~c u¿ytkownicy\tdodaj u¿ytkowników do pola Cc:\n~f listy\tdo³±cz listy\n~F listy\tto samo co ~f ale do³±cz te¿ nag³ówki\n~h\t\tedytuj nag³ówki\n~m listy\tdodaj i komentuj listy\n~M listy\tto samo co ~m ale do³±cz te¿ nag³ówki\n~p\t\tdrukuj list\n~q\t\tzapisz plik i wyjd¼ z edytora\n~r plik\t\twczytaj plik do edytora\n~t u¿ytkownicy\tdodaj u¿ytkowników do pola To:\n~u\t\todtwórz poprzedni± liniê\n~v\t\tedytuj list edytorem $visual\n~w plik\t\tzapisz list do pliku\n~x\t\tporzuæ zmiany i wyjd¼ z edytora\n~?\t\tten list\n.\t\tstoj±c sama w linii koñczy wpisywanie\n" - - #: edit.c:186 - #, c-format -@@ -1161,9 +1089,7 @@ msgstr "Wyczy¶æ flagê" - - #: handler.c:1349 - msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n" --msgstr "" --"[--B³±d: Nie mo¿na wy¶wietliæ ¿adnego z fragmentów Multipart/Alternative! " --"--]\n" -+msgstr "[--B³±d: Nie mo¿na wy¶wietliæ ¿adnego z fragmentów Multipart/Alternative! --]\n" - - #: handler.c:1459 - #, c-format -@@ -1197,8 +1123,7 @@ msgstr "[-- Komunikaty b³êdów %s --]\n" - - #: handler.c:1643 - msgid "[-- Error: message/external-body has no access-type parameter --]\n" --msgstr "" --"[-- B³±d: message/external-body nie ma ustawionego rodzaju dostêpu --]\n" -+msgstr "[-- B³±d: message/external-body nie ma ustawionego rodzaju dostêpu --]\n" - - #: handler.c:1662 - #, c-format -@@ -1230,12 +1155,8 @@ msgid "[-- This %s/%s attachment is not - msgstr "[-- Ten za³±cznik typu %s/%s nie jest zawarty, --]\n" - - #: handler.c:1696 --msgid "" --"[-- and the indicated external source has --]\n" --"[-- expired. --]\n" --msgstr "" --"[-- a podane ¼ród³o zewnêtrzne jest --]\n" --"[-- nieaktualne. --]\n" -+msgid "[-- and the indicated external source has --]\n[-- expired. --]\n" -+msgstr "[-- a podane ¼ród³o zewnêtrzne jest --]\n[-- nieaktualne. --]\n" - - #: handler.c:1714 - #, c-format -@@ -1282,24 +1203,12 @@ msgid "" - msgstr "" - - #: help.c:336 --msgid "" --"\n" --"Generic bindings:\n" --"\n" --msgstr "" --"\n" --"Standardowe przypisania klawiszy:\n" --"\n" -+msgid "\nGeneric bindings:\n\n" -+msgstr "\nStandardowe przypisania klawiszy:\n\n" - - #: help.c:340 --msgid "" --"\n" --"Unbound functions:\n" --"\n" --msgstr "" --"\n" --"Nie przypisane klawiszom funkcje:\n" --"\n" -+msgid "\nUnbound functions:\n\n" -+msgstr "\nNie przypisane klawiszom funkcje:\n\n" - - #: help.c:348 - #, c-format -@@ -1307,7 +1216,6 @@ msgid "Help for %s" - msgstr "Pomoc dla menu %s" - - #: hook.c:246 --#, c-format - msgid "unhook: Can't do unhook * from within a hook." - msgstr "unhook: Nie mo¿na wykonaæ \"unhook *\" wewn±trz innego polecenia hook." - -@@ -1371,7 +1279,7 @@ msgstr "Uwierzytelnianie (%s)..." - msgid "SASL authentication failed." - msgstr "Uwierzytelnianie SASL nie powiod³o siê." - --#: imap/browse.c:68 imap/imap.c:559 -+#: imap/browse.c:68 imap/imap.c:542 - #, c-format - msgid "%s is an invalid IMAP path" - msgstr "%s jest b³êdn± ¶cie¿k± IMAP" -@@ -1392,7 +1300,7 @@ msgstr "Brak skrzynki" - msgid "Create mailbox: " - msgstr "Nazwa skrzynki: " - --#: imap/browse.c:286 imap/browse.c:332 -+#: imap/browse.c:286 - msgid "Mailbox must have a name." - msgstr "Skrzynka musi zostaæ nazwana." - -@@ -1400,21 +1308,6 @@ msgstr "Skrzynka musi zostaæ nazwana." - msgid "Mailbox created." - msgstr "Skrzynka zosta³a utworzona." - --#: imap/browse.c:325 --#, fuzzy, c-format --msgid "Rename mailbox %s to: " --msgstr "Nazwa skrzynki: " -- --#: imap/browse.c:338 --#, fuzzy, c-format --msgid "Rename failed: %s" --msgstr "SSL nie powiod³o siê: %s" -- --#: imap/browse.c:343 --#, fuzzy --msgid "Mailbox renamed." --msgstr "Skrzynka zosta³a utworzona." -- - #: imap/command.c:294 - msgid "Mailbox closed" - msgstr "Skrzynka zosta³a zamkniêta" -@@ -1426,84 +1319,84 @@ msgstr "Skrzynka zosta³a zamkniêta" - msgid "Fatal error. Message count is out of sync!" - msgstr "B³±d krytyczny. Niezidentyfikowana ilo¶æ listów!" - --#: imap/imap.c:168 -+#: imap/imap.c:151 - #, c-format - msgid "Closing connection to %s..." - msgstr "Zamykanie po³±czenia do %s..." - --#: imap/imap.c:328 -+#: imap/imap.c:311 - msgid "This IMAP server is ancient. Mutt does not work with it." - msgstr "Zbyt stara wersja serwera IMAP. Praca z tym serwerem nie jest mo¿liwa." - --#: imap/imap.c:419 -+#: imap/imap.c:402 - #, c-format - msgid "Unexpected response received from server: %s" - msgstr "Otrzymano nieoczekiwan± odpowied¼ od serwera: %s" - --#: imap/imap.c:439 pop_lib.c:284 -+#: imap/imap.c:422 pop_lib.c:284 - msgid "Secure connection with TLS?" - msgstr "Po³±czyæ u¿ywaj±c TLS?" - --#: imap/imap.c:452 pop_lib.c:308 -+#: imap/imap.c:435 pop_lib.c:308 - msgid "Could not negotiate TLS connection" - msgstr "Po³±czenie TSL nie zosta³o wynegocjowane" - --#: imap/imap.c:590 -+#: imap/imap.c:573 - #, c-format - msgid "Selecting %s..." - msgstr "Wybieranie %s..." - --#: imap/imap.c:726 -+#: imap/imap.c:709 - msgid "Error opening mailbox" - msgstr "B³±d otwarcia skrzynki" - - #. STATUS not supported --#: imap/imap.c:780 -+#: imap/imap.c:763 - msgid "Unable to append to IMAP mailboxes at this server" - msgstr "Nie mo¿na dopisaæ do skrzynek IMAP na tym serwerze" - - #. command failed cause folder doesn't exist --#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234 -+#: imap/imap.c:772 imap/message.c:720 muttlib.c:1234 - #, c-format - msgid "Create %s?" - msgstr "Utworzyæ %s?" - --#: imap/imap.c:975 pop.c:465 -+#: imap/imap.c:958 pop.c:465 - #, c-format - msgid "Marking %d messages deleted..." - msgstr "Zaznaczanie %d listów jako skasowanych..." - --#: imap/imap.c:984 -+#: imap/imap.c:967 - msgid "Expunge failed" - msgstr "Skasowanie nie powiod³o siê" - --#: imap/imap.c:999 -+#: imap/imap.c:982 - #, c-format - msgid "Saving message status flags... [%d/%d]" - msgstr "Zapisywanie stanu flag listów... [%d/%d]" - --#: imap/imap.c:1083 -+#: imap/imap.c:1066 - msgid "Expunging messages from server..." - msgstr "Kasowanie listów na serwerze... " - --#: imap/imap.c:1088 -+#: imap/imap.c:1071 - msgid "imap_sync_mailbox: EXPUNGE failed" - msgstr "imap_sync_mailbox: skasowanie nie powiod³o siê" - --#: imap/imap.c:1122 -+#: imap/imap.c:1105 - msgid "CLOSE failed" - msgstr "Polecenie CLOSE nie powiod³o siê" - --#: imap/imap.c:1365 -+#: imap/imap.c:1348 - msgid "Bad mailbox name" - msgstr "B³êdna nazwa skrzynki" - --#: imap/imap.c:1377 -+#: imap/imap.c:1360 - #, c-format - msgid "Subscribing to %s..." - msgstr "Subskrybowanie %s..." - --#: imap/imap.c:1379 -+#: imap/imap.c:1362 - #, c-format - msgid "Unsubscribing to %s..." - msgstr "Odsubskrybowanie %s..." -@@ -1519,9 +1412,9 @@ msgid "Could not create temporary file % - msgstr "Nie mo¿na utworzyæ pliku tymczasowego %s" - - #: imap/message.c:134 --#, fuzzy, c-format -+#, c-format - msgid "Evaluating cache... [%d/%d]" --msgstr "Pobieranie nag³ówków listów... [%d/%d]" -+msgstr "Szacowanie bufora... [%d/%d]" - - #: imap/message.c:202 pop.c:210 - #, c-format -@@ -1536,16 +1429,16 @@ msgstr "Pobieranie listu..." - msgid "The message index is incorrect. Try reopening the mailbox." - msgstr "B³êdny indeks listów. Spróbuj ponownie otworzyæ skrzynkê." - --#: imap/message.c:589 -+#: imap/message.c:586 - msgid "Uploading message ..." - msgstr "£adowanie listu ..." - --#: imap/message.c:699 -+#: imap/message.c:696 - #, c-format - msgid "Copying %d messages to %s..." - msgstr "Kopiowanie %d listów do %s..." - --#: imap/message.c:703 -+#: imap/message.c:700 - #, c-format - msgid "Copying message %d to %s..." - msgstr "Kopiowanie listu %d do %s..." -@@ -1596,12 +1489,10 @@ msgid "%s: unknown variable" - msgstr "%s: nieznana zmienna" - - #: init.c:1243 --#, c-format - msgid "prefix is illegal with reset" - msgstr "reset: nieprawid³owy prefiks" - - #: init.c:1249 --#, c-format - msgid "value is illegal with reset" - msgstr "reset: nieprawid³owa warto¶æ" - -@@ -1789,8 +1680,7 @@ msgstr "odsubskrybuj bie¿±c± skrzynkê (t - - #: keymap_alldefs.h:17 - msgid "toggle view all/subscribed mailboxes (IMAP only)" --msgstr "" --"zmieñ tryb przegl±dania skrzynek: wszystkie/zasubskrybowane (tylko IMAP)" -+msgstr "zmieñ tryb przegl±dania skrzynek: wszystkie/zasubskrybowane (tylko IMAP)" - - #: keymap_alldefs.h:18 - msgid "list mailboxes with new mail" -@@ -2325,199 +2215,194 @@ msgid "{internal}" - msgstr "{wewnêtrzne}" - - #: keymap_alldefs.h:151 --#, fuzzy --msgid "rename the current mailbox (IMAP only)" --msgstr "usuñ bie¿±c± skrzynkê (tylko IMAP)" -- --#: keymap_alldefs.h:152 - msgid "reply to a message" - msgstr "odpowiedz na list" - --#: keymap_alldefs.h:153 -+#: keymap_alldefs.h:152 - msgid "use the current message as a template for a new one" - msgstr "u¿yj bie¿±cego listu jako wzorca dla nowych wiadomo¶ci" - --#: keymap_alldefs.h:154 -+#: keymap_alldefs.h:153 - msgid "save message/attachment to a file" - msgstr "zapisz list/za³±cznik do pliku" - --#: keymap_alldefs.h:155 -+#: keymap_alldefs.h:154 - msgid "search for a regular expression" - msgstr "szukaj wyra¿enia regularnego" - --#: keymap_alldefs.h:156 -+#: keymap_alldefs.h:155 - msgid "search backwards for a regular expression" - msgstr "szukaj wstecz wyra¿enia regularnego" - --#: keymap_alldefs.h:157 -+#: keymap_alldefs.h:156 - msgid "search for next match" - msgstr "szukaj nastêpnego pozytywnego rezultatu" - --#: keymap_alldefs.h:158 -+#: keymap_alldefs.h:157 - msgid "search for next match in opposite direction" - msgstr "szukaj wstecz nastêpnego pozytywnego rezultatu" - --#: keymap_alldefs.h:159 -+#: keymap_alldefs.h:158 - msgid "toggle search pattern coloring" - msgstr "ustala czy szukana fraza ma byæ zaznaczona kolorem" - --#: keymap_alldefs.h:160 -+#: keymap_alldefs.h:159 - msgid "invoke a command in a subshell" - msgstr "wywo³aj polecenie w podpow³oce" - --#: keymap_alldefs.h:161 -+#: keymap_alldefs.h:160 - msgid "sort messages" - msgstr "uszereguj listy" - --#: keymap_alldefs.h:162 -+#: keymap_alldefs.h:161 - msgid "sort messages in reverse order" - msgstr "uszereguj listy w odwrotnej kolejno¶ci" - --#: keymap_alldefs.h:163 -+#: keymap_alldefs.h:162 - msgid "tag the current entry" - msgstr "zaznacz bie¿±c± pozycjê" - --#: keymap_alldefs.h:164 -+#: keymap_alldefs.h:163 - msgid "apply next function to tagged messages" - msgstr "wykonaj nastêpne polecenie na zaznaczonych listach" - --#: keymap_alldefs.h:165 -+#: keymap_alldefs.h:164 - msgid "apply next function ONLY to tagged messages" - msgstr "wykonaj nastêpne polecenie TYLKO na zaznaczonych listach" - --#: keymap_alldefs.h:166 -+#: keymap_alldefs.h:165 - msgid "tag the current subthread" - msgstr "zaznacz bie¿±cy podw±tek" - --#: keymap_alldefs.h:167 -+#: keymap_alldefs.h:166 - msgid "tag the current thread" - msgstr "zaznacz bie¿±cy w±tek" - --#: keymap_alldefs.h:168 -+#: keymap_alldefs.h:167 - msgid "toggle a message's 'new' flag" - msgstr "ustaw flagê listu na 'nowy'" - --#: keymap_alldefs.h:169 -+#: keymap_alldefs.h:168 - msgid "toggle whether the mailbox will be rewritten" - msgstr "ustala czy skrzynka bêdzie ponownie zapisana" - --#: keymap_alldefs.h:170 -+#: keymap_alldefs.h:169 - msgid "toggle whether to browse mailboxes or all files" - msgstr "ustala czy przegl±daæ skrzynki czy wszystkie pliki" - --#: keymap_alldefs.h:171 -+#: keymap_alldefs.h:170 - msgid "move to the top of the page" - msgstr "przejd¼ na pocz±tek strony" - --#: keymap_alldefs.h:172 -+#: keymap_alldefs.h:171 - msgid "undelete the current entry" - msgstr "odtwórz bie¿±c± pozycjê listy" - --#: keymap_alldefs.h:173 -+#: keymap_alldefs.h:172 - msgid "undelete all messages in thread" - msgstr "odtwórz wszystkie listy z tego w±tku" - --#: keymap_alldefs.h:174 -+#: keymap_alldefs.h:173 - msgid "undelete all messages in subthread" - msgstr "odtwórz wszystkie listy z tego podw±tku" - --#: keymap_alldefs.h:175 -+#: keymap_alldefs.h:174 - msgid "show the Mutt version number and date" - msgstr "poka¿ wersjê i datê programu pocztowego Mutt" - --#: keymap_alldefs.h:176 -+#: keymap_alldefs.h:175 - msgid "view attachment using mailcap entry if necessary" - msgstr "poka¿ za³±cznik u¿ywaj±c, je¶li to niezbêdne, pliku 'mailcap'" - --#: keymap_alldefs.h:177 -+#: keymap_alldefs.h:176 - msgid "show MIME attachments" - msgstr "poka¿ za³±czniki MIME" - --#: keymap_alldefs.h:178 -+#: keymap_alldefs.h:177 - msgid "display the keycode for a key press" - msgstr "wy¶wietl kod wprowadzonego znaku" - --#: keymap_alldefs.h:179 -+#: keymap_alldefs.h:178 - msgid "show currently active limit pattern" - msgstr "poka¿ bie¿±cy wzorzec ograniczaj±cy" - --#: keymap_alldefs.h:180 -+#: keymap_alldefs.h:179 - msgid "collapse/uncollapse current thread" - msgstr "zwiñ/rozwiñ bie¿±cy w±tek" - --#: keymap_alldefs.h:181 -+#: keymap_alldefs.h:180 - msgid "collapse/uncollapse all threads" - msgstr "zwiñ/rozwiñ wszystkie w±tki" - --#: keymap_alldefs.h:182 -+#: keymap_alldefs.h:181 - msgid "attach a PGP public key" - msgstr "do³±cz w³asny klucz publiczny PGP" - --#: keymap_alldefs.h:183 -+#: keymap_alldefs.h:182 - msgid "show PGP options" - msgstr "poka¿ opcje PGP" - --#: keymap_alldefs.h:184 -+#: keymap_alldefs.h:183 - msgid "mail a PGP public key" - msgstr "wy¶lij w³asny klucz publiczny PGP" - --#: keymap_alldefs.h:185 -+#: keymap_alldefs.h:184 - msgid "verify a PGP public key" - msgstr "zweryfikuj klucz publiczny PGP" - --#: keymap_alldefs.h:186 -+#: keymap_alldefs.h:185 - msgid "view the key's user id" - msgstr "obejrzyj identyfikator u¿ytkownika klucza" - --#: keymap_alldefs.h:187 -+#: keymap_alldefs.h:186 - msgid "check for classic pgp" - msgstr "u¿yj starej wersji pgp" - --#: keymap_alldefs.h:188 -+#: keymap_alldefs.h:187 - msgid "Accept the chain constructed" - msgstr "Potwierd¼ skonstruowany ³añcuch" - --#: keymap_alldefs.h:189 -+#: keymap_alldefs.h:188 - msgid "Append a remailer to the chain" - msgstr "Dodaj remailera do ³añcucha" - --#: keymap_alldefs.h:190 -+#: keymap_alldefs.h:189 - msgid "Insert a remailer into the chain" - msgstr "Wprowadz remailera do ³añcucha" - --#: keymap_alldefs.h:191 -+#: keymap_alldefs.h:190 - msgid "Delete a remailer from the chain" - msgstr "Usuñ remailera z ³añcucha" - --#: keymap_alldefs.h:192 -+#: keymap_alldefs.h:191 - msgid "Select the previous element of the chain" - msgstr "Wybierz poprzedni element ³añcucha" - --#: keymap_alldefs.h:193 -+#: keymap_alldefs.h:192 - msgid "Select the next element of the chain" - msgstr "Wybierz nastepny element ³añcucha" - --#: keymap_alldefs.h:194 -+#: keymap_alldefs.h:193 - msgid "send the message through a mixmaster remailer chain" - msgstr "przeslij list przez ³añcuch anonimowych remailerów typu mixmaster" - --#: keymap_alldefs.h:195 -+#: keymap_alldefs.h:194 - msgid "make decrypted copy and delete" - msgstr "utwórz rozszyfrowana± kopiê i usuñ orygina³" - --#: keymap_alldefs.h:196 -+#: keymap_alldefs.h:195 - msgid "make decrypted copy" - msgstr "utwórz rozszyfrowan± kopiê" - --#: keymap_alldefs.h:197 -+#: keymap_alldefs.h:196 - msgid "wipe passphrase(s) from memory" - msgstr "wyma¿ has³o z pamiêci operacyjnej" - --#: keymap_alldefs.h:198 -+#: keymap_alldefs.h:197 - msgid "extract supported public keys" - msgstr "kopiuj klucze publiczne" - --#: keymap_alldefs.h:199 -+#: keymap_alldefs.h:198 - msgid "show S/MIME options" - msgstr "poka¿ opcje S/MIME" - -@@ -2530,159 +2415,24 @@ msgid "Out of memory!" - msgstr "Brak pamiêci!" - - #: main.c:51 --msgid "" --"To contact the developers, please mail to .\n" --"To report a bug, please use the flea(1) utility.\n" --msgstr "" --"Aby powiadomiæ autorów, proszê pisaæ na .\n" --"Aby zg³osiæ b³±d u¿yj programu flea(1).\n" -+msgid "To contact the developers, please mail to .\nTo report a bug, please use the flea(1) utility.\n" -+msgstr "Aby powiadomiæ autorów, proszê pisaæ na .\nAby zg³osiæ b³±d u¿yj programu flea(1).\n" - - #: main.c:55 --msgid "" --"Copyright (C) 1996-2002 Michael R. Elkins and others.\n" --"Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n" --"Mutt is free software, and you are welcome to redistribute it\n" --"under certain conditions; type `mutt -vv' for details.\n" --msgstr "" --"Copyright (C) 1996-2002 Michael R. Elkins i inni.\n" --"Program nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -" --"vv'.\n" --"Mutt jest darmowym oprogramowaniem, jeste¶ jak najbardziej uprawniony do\n" --"jego redystrybucji pod pewnymi warunkami, szczegó³y poznasz pisz±c 'mutt -" --"vv'.\n" -+msgid "Copyright (C) 1996-2002 Michael R. Elkins and others.\nMutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\nMutt is free software, and you are welcome to redistribute it\nunder certain conditions; type `mutt -vv' for details.\n" -+msgstr "Copyright (C) 1996-2002 Michael R. Elkins i inni.\nProgram nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -vv'.\nMutt jest darmowym oprogramowaniem, jeste¶ jak najbardziej uprawniony do\njego redystrybucji pod pewnymi warunkami, szczegó³y poznasz pisz±c 'mutt -vv'.\n" - - #: main.c:61 --msgid "" --"Copyright (C) 1996-2002 Michael R. Elkins \n" --"Copyright (C) 1996-2002 Brandon Long \n" --"Copyright (C) 1997-2002 Thomas Roessler \n" --"Copyright (C) 1998-2002 Werner Koch \n" --"Copyright (C) 1999-2002 Brendan Cully \n" --"Copyright (C) 1999-2002 Tommi Komulainen \n" --"Copyright (C) 2000-2002 Edmund Grimley Evans \n" --"\n" --"Lots of others not mentioned here contributed lots of code,\n" --"fixes, and suggestions.\n" --"\n" --" This program is free software; you can redistribute it and/or modify\n" --" it under the terms of the GNU General Public License as published by\n" --" the Free Software Foundation; either version 2 of the License, or\n" --" (at your option) any later version.\n" --"\n" --" This program is distributed in the hope that it will be useful,\n" --" but WITHOUT ANY WARRANTY; without even the implied warranty of\n" --" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" --" GNU General Public License for more details.\n" --"\n" --" You should have received a copy of the GNU General Public License\n" --" along with this program; if not, write to the Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" --msgstr "" --"Copyright (C) 1996-2002 Michael R. Elkins \n" --"Copyright (C) 1996-2002 Brandon Long \n" --"Copyright (C) 1997-2002 Thomas Roessler \n" --"Copyright (C) 1998-2002 Werner Koch \n" --"Copyright (C) 1999-2002 Brendan Cully \n" --"Copyright (C) 1999-2002 Tommi Komulainen \n" --"Copyright (C) 2000-2002 Edmund Grimley Evans \n" --"\n" --"Wielu innych twórców, nie wspomnianych tutaj,\n" --"wnios³o wiele nowego kodu, poprawek i sugestii.\n" --"\n" --" Ten program jest darmowy; mo¿esz rozprowadzaæ go i/lub modyfikowaæ\n" --" zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n" --" Licence), opublikowanej przez Free Software Foundation, w wersji 2\n" --" lub wy¿szej.\n" --"\n" --" Program ten jest rozprowadzany w nadziei, ¿e bêdzie przydatny,\n" --" ale BEZ ¯ADNYCH GWARANCJI, wyra¿onych wprost lub domy¶lnie nawet,\n" --" w tym gwarancji mo¿liwo¶ci SPRZEDA¯Y i PRZYDATNO¦CI DO KONKRETNYCH " --"CELÓW.\n" --" Szczegó³y znajdziesz w Powszechnej Licencji Publicznej GNU.\n" --"\n" --" W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n" --" Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+msgid "Copyright (C) 1996-2002 Michael R. Elkins \nCopyright (C) 1996-2002 Brandon Long \nCopyright (C) 1997-2002 Thomas Roessler \nCopyright (C) 1998-2002 Werner Koch \nCopyright (C) 1999-2002 Brendan Cully \nCopyright (C) 1999-2002 Tommi Komulainen \nCopyright (C) 2000-2002 Edmund Grimley Evans \n\nLots of others not mentioned here contributed lots of code,\nfixes, and suggestions.\n\n This program is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program; if not, write to the Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+msgstr "Copyright (C) 1996-2002 Michael R. Elkins \nCopyright (C) 1996-2002 Brandon Long \nCopyright (C) 1997-2002 Thomas Roessler \nCopyright (C) 1998-2002 Werner Koch \nCopyright (C) 1999-2002 Brendan Cully \nCopyright (C) 1999-2002 Tommi Komulainen \nCopyright (C) 2000-2002 Edmund Grimley Evans \n\nWielu innych twórców, nie wspomnianych tutaj,\nwnios³o wiele nowego kodu, poprawek i sugestii.\n\n Ten program jest darmowy; mo¿esz rozprowadzaæ go i/lub modyfikowaæ\n zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n Licence), opublikowanej przez Free Software Foundation, w wersji 2\n lub wy¿szej.\n\n Program ten jest rozprowadzany w nadziei, ¿e bêdzie przydatny,\n ale BEZ ¯ADNYCH GWARANCJI, wyra¿onych wprost lub domy¶lnie nawet,\n w tym gwarancji mo¿liwo¶ci SPRZEDA¯Y i PRZYDATNO¦CI DO KONKRETNYCH CELÓW.\n Szczegó³y znajdziesz w Powszechnej Licencji Publicznej GNU.\n\n W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" - - #: main.c:99 --#, fuzzy --msgid "" --"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " --" ]\n" --" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " --"[...]\n" --" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " --"[...]\n" --" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] " --"[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" --" mutt [ -n ] [ -e ] [ -F ] -p\n" --" mutt -v[v]\n" --"\n" --"options:\n" --" -A \texpand the given alias\n" --" -a \tattach a file to the message\n" --" -b

\tspecify a blind carbon-copy (BCC) address\n" --" -c
\tspecify a carbon-copy (CC) address\n" --" -e \tspecify a command to be executed after initialization\n" --" -f \tspecify which mailbox to read\n" --" -F \tspecify an alternate muttrc file\n" --" -H \tspecify a draft file to read header and body from\n" --" -i \tspecify a file which Mutt should include in the body\n" --" -m \tspecify a default mailbox type\n" --" -n\t\tcauses Mutt not to read the system Muttrc\n" --" -p\t\trecall a postponed message\n" --" -Q \tquery a configuration variable\n" --" -R\t\topen mailbox in read-only mode\n" --" -s \tspecify a subject (must be in quotes if it has spaces)\n" --" -v\t\tshow version and compile-time definitions\n" --" -x\t\tsimulate the mailx send mode\n" --" -y\t\tselect a mailbox specified in your `mailboxes' list\n" --" -z\t\texit immediately if there are no messages in the mailbox\n" --" -Z\t\topen the first folder with new message, exit immediately if none\n" --" -h\t\tthis help message" --msgstr "" --"u¿ycie: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " --" ]\n" --" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q " --" ] [...]\n" --" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " --"[...]\n" --" mutt [ -nx ] [ -e ] [ -F ] [ -a ] [ -H " --" ] [ -i ] [ -s ] [ -b ] [ -c ] " --"[ ... ]\n" --" mutt [ -n ] [ -e ] [ -F ] -p\n" --" mutt -v[v]\n" --"\n" --"opcje:\n" --" -A \tu¿yj aliasu\n" --" -a \tdo³±cz plik do listu\n" --" -b \tpodaj adres blind carbon-copy (BCC)\n" --" -c \tpodaj adres carbon-copy (CC)\n" --" -e \tpodaj polecenie do wykonania po inicjalizacji\n" --" -f \totwórz najpierw t± skrzynkê\n" --" -F \tu¿yj alternatywnego pliku muttrc\n" --" -H \tczytaj nag³ówki z pliku\n" --" -i \twstaw ten plik w odpowiedzi\n" --" -m \tpodaj typ skrzynki\n" --" -n\t\tnie czytaj systemowego Muttrc\n" --" -p\t\tponownie edytuj zarzucony list\n" --" -Q \tpodaj warto¶æ zmiennej konfiguracyjnej\n" --" -R\t\totwórz skrzynkê w trybie tylko do odczytu\n" --" -s \tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n" --" -v\t\tpoka¿ wersjê i wkompilowane parametry\n" --" -x\t\tsymuluj zachowanie mailx\n" --" -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n" --" -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n" --" -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n" --" -h\t\tten tekst" -+msgid "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n mutt [ -n ] [ -e ] [ -F ] -p\n mutt -v[v]\n\noptions:\n -A \texpand the given alias\n -a \tattach a file to the message\n -b
\tspecify a blind carbon-copy (BCC) address\n -c
\tspecify a carbon-copy (CC) address\n -e \tspecify a command to be executed after initialization\n -f \tspecify which mailbox to read\n -F \tspecify an alternate muttrc file\n -H \tspecify a draft file to read header and body from\n -i \tspecify a file which Mutt should include in the body\n -m \tspecify a default mailbox type\n -n\t\tcauses Mutt not to read the system Muttrc\n -p\t\trecall a postponed message\n -Q \tquery a configuration variable\n -R\t\topen mailbox in read-only mode\n -s \tspecify a subject (must be in quotes if it has spaces)\n -v\t\tshow version and compile-time definitions\n -x\t\tsimulate the mailx send mode\n -y\t\tselect a mailbox specified in your `mailboxes' list\n -z\t\texit immediately if there are no messages in the mailbox\n -Z\t\topen the first folder with new message, exit immediately if none\n -h\t\tthis help message" -+msgstr "u¿ycie: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n mutt [ -nx ] [ -e ] [ -F ] [ -a ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n mutt [ -n ] [ -e ] [ -F ] -p\n mutt -v[v]\n\nopcje:\n -A \tu¿yj aliasu\n -a \tdo³±cz plik do listu\n -b \tpodaj adres blind carbon-copy (BCC)\n -c \tpodaj adres carbon-copy (CC)\n -e \tpodaj polecenie do wykonania po inicjalizacji\n -f \totwórz najpierw t± skrzynkê\n -F \tu¿yj alternatywnego pliku muttrc\n -H \twczytaj szablon nag³ówków i tre¶ci listu z pliku\n -i \twstaw ten plik w odpowiedzi\n -m \tpodaj typ skrzynki\n -n\t\tnie czytaj systemowego Muttrc\n -p\t\tponownie edytuj zarzucony list\n -Q \tpodaj warto¶æ zmiennej konfiguracyjnej\n -R\t\totwórz skrzynkê w trybie tylko do odczytu\n -s \tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n -v\t\tpoka¿ wersjê i wkompilowane parametry\n -x\t\tsymuluj zachowanie mailx\n -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n -h\t\tten tekst" - - #: main.c:167 --msgid "" --"\n" --"Compile options:" --msgstr "" --"\n" --"Parametry kompilacji:" -+msgid "\nCompile options:" -+msgstr "\nParametry kompilacji:" - - #: main.c:478 - msgid "Error initializing terminal." -@@ -2755,9 +2505,7 @@ msgstr "Nie mo¿na zablokowaæ skrzynki po - #. - #: mbox.c:754 - msgid "sync: mbox modified, but no modified messages! (report this bug)" --msgstr "" --"sync: skrzynka zmodyfikowana, ale ¿aden z listów nie zosta³ zmieniony! " --"(zg³o¶ ten b³±d)" -+msgstr "sync: skrzynka zmodyfikowana, ale ¿aden z listów nie zosta³ zmieniony! (zg³o¶ ten b³±d)" - - #: mbox.c:793 - #, c-format -@@ -2792,72 +2540,72 @@ msgstr "Przeskocz do: " - msgid "Invalid index number." - msgstr "Niew³a¶ciwy numer indeksu." - --#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558 --#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043 -+#: menu.c:429 menu.c:447 menu.c:483 menu.c:526 menu.c:542 menu.c:553 -+#: menu.c:564 menu.c:606 menu.c:617 menu.c:630 menu.c:643 menu.c:1038 - msgid "No entries." - msgstr "Brak pozycji." - --#: menu.c:447 -+#: menu.c:444 - msgid "You cannot scroll down farther." - msgstr "Nie mo¿na ni¿ej przewin±æ." - --#: menu.c:465 -+#: menu.c:460 - msgid "You cannot scroll up farther." - msgstr "Nie mo¿na wy¿ej przewin±æ." - --#: menu.c:485 -+#: menu.c:480 - msgid "You are on the last page." - msgstr "To jest ostatnia strona." - --#: menu.c:509 -+#: menu.c:504 - msgid "You are on the first page." - msgstr "To jest pierwsza strona." - --#: menu.c:588 -+#: menu.c:583 - msgid "First entry is shown." - msgstr "Pokazana jest pierwsza pozycja." - --#: menu.c:608 -+#: menu.c:603 - msgid "Last entry is shown." - msgstr "Pokazana jest ostatnia pozycja." - --#: menu.c:659 -+#: menu.c:654 - msgid "You are on the last entry." - msgstr "To jest ostatnia pozycja." - --#: menu.c:670 -+#: menu.c:665 - msgid "You are on the first entry." - msgstr "To jest pierwsza pozycja." - --#: menu.c:730 pattern.c:1242 -+#: menu.c:725 pattern.c:1242 - msgid "Search for: " - msgstr "Szukaj frazy: " - --#: menu.c:731 pattern.c:1243 -+#: menu.c:726 pattern.c:1243 - msgid "Reverse search for: " - msgstr "Szukaj frazy w przeciwnym kierunku: " - --#: menu.c:741 pattern.c:1275 -+#: menu.c:736 pattern.c:1275 - msgid "No search pattern." - msgstr "Nie ustalono wzorca poszukiwañ." - --#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340 -+#: menu.c:766 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340 - msgid "Not found." - msgstr "Nic nie znaleziono." - --#: menu.c:895 -+#: menu.c:890 - msgid "No tagged entries." - msgstr "Brak zaznaczonych pozycji listy." - --#: menu.c:1000 -+#: menu.c:995 - msgid "Search is not implemented for this menu." - msgstr "Poszukiwanie nie jest mo¿liwe w tym menu." - --#: menu.c:1005 -+#: menu.c:1000 - msgid "Jumping is not implemented for dialogs." - msgstr "Przeskakiwanie nie jest mo¿liwe w oknach dialogowych." - --#: menu.c:1046 -+#: menu.c:1041 - msgid "Tagging is not supported." - msgstr "Zaznaczanie nie jest obs³ugiwane." - -@@ -2992,7 +2740,6 @@ msgid "Unknown" - msgstr "Nieznany" - - #: mutt_ssl.c:413 --#, c-format - msgid "[unable to calculate]" - msgstr "[niemo¿liwe do wyznaczenia]" - -@@ -3017,7 +2764,6 @@ msgid "This certificate was issued by:" - msgstr "Ten certyfikat zosta³ wydany przez:" - - #: mutt_ssl.c:608 --#, c-format - msgid "This certificate is valid" - msgstr "Ten certyfikat jest wa¿ny" - -@@ -3270,7 +3016,6 @@ msgid "%c: not supported in this mode" - msgstr "%c: nie obs³ugiwane w tym trybie" - - #: pattern.c:807 --#, c-format - msgid "missing parameter" - msgstr "brakuj±cy parametr" - -@@ -3325,32 +3070,20 @@ msgid "[-- Error: unable to create PGP s - msgstr "[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n" - - #: pgp.c:379 pgp.c:596 pgp.c:797 --msgid "" --"[-- End of PGP output --]\n" --"\n" --msgstr "" --"[-- Koniec komunikatów PGP --]\n" --"\n" -+msgid "[-- End of PGP output --]\n\n" -+msgstr "[-- Koniec komunikatów PGP --]\n\n" - - #: pgp.c:394 --msgid "" --"[-- BEGIN PGP MESSAGE --]\n" --"\n" --msgstr "" --"[-- POCZ¡TEK LISTU PGP --]\n" --"\n" -+msgid "[-- BEGIN PGP MESSAGE --]\n\n" -+msgstr "[-- POCZ¡TEK LISTU PGP --]\n\n" - - #: pgp.c:396 - msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" - msgstr "[-- POCZ¡TEK KLUCZA PUBLICZNEGO PGP --]\n" - - #: pgp.c:398 --msgid "" --"[-- BEGIN PGP SIGNED MESSAGE --]\n" --"\n" --msgstr "" --"[-- POCZ¡TEK LISTU PODPISANEGO PGP --]\n" --"\n" -+msgid "[-- BEGIN PGP SIGNED MESSAGE --]\n\n" -+msgstr "[-- POCZ¡TEK LISTU PODPISANEGO PGP --]\n\n" - - #: pgp.c:423 - msgid "[-- END PGP MESSAGE --]\n" -@@ -3365,44 +3098,28 @@ msgid "[-- END PGP SIGNED MESSAGE --]\n" - msgstr "[-- KONIEC LISTU PODPISANEGO PGP --]\n" - - #: pgp.c:454 --msgid "" --"[-- Error: could not find beginning of PGP message! --]\n" --"\n" --msgstr "" --"[-- B³±d: nie mo¿na odnale¼æ pocz±tku listu PGP! --]\n" --"\n" -+msgid "[-- Error: could not find beginning of PGP message! --]\n\n" -+msgstr "[-- B³±d: nie mo¿na odnale¼æ pocz±tku listu PGP! --]\n\n" - - #: pgp.c:704 - msgid "Internal error. Inform ." - msgstr "B³±d wewnêtrzny. Zg³o¶ go pod adres ." - - #: pgp.c:764 --msgid "" --"[-- Error: could not create a PGP subprocess! --]\n" --"\n" --msgstr "" --"[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n" --"\n" -+msgid "[-- Error: could not create a PGP subprocess! --]\n\n" -+msgstr "[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n\n" - - #: pgp.c:873 --msgid "" --"[-- Error: malformed PGP/MIME message! --]\n" --"\n" --msgstr "" --"[-- B³±d: uszkodzony list PGP/MIME! --]\n" --"\n" -+msgid "[-- Error: malformed PGP/MIME message! --]\n\n" -+msgstr "[-- B³±d: uszkodzony list PGP/MIME! --]\n\n" - - #: pgp.c:886 - msgid "[-- Error: could not create temporary file! --]\n" - msgstr "[-- B³±d: nie mo¿na utworzyæ pliku tymczasowego! --]\n" - - #: pgp.c:895 --msgid "" --"[-- The following data is PGP/MIME encrypted --]\n" --"\n" --msgstr "" --"[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n" --"\n" -+msgid "[-- The following data is PGP/MIME encrypted --]\n\n" -+msgstr "[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n\n" - - #: pgp.c:915 - msgid "[-- End of PGP/MIME encrypted data --]\n" -@@ -3426,25 +3143,25 @@ msgstr "Wprowad¼ numer klucza dla %s: " - msgid "Can't invoke PGP" - msgstr "Nie mo¿na wywo³aæ PGP" - --#: pgp.c:1496 -+#: pgp.c:1491 - #, c-format - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? " - msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? " - --#: pgp.c:1497 -+#: pgp.c:1492 - msgid "PGP/M(i)ME" - msgstr "PGP/M(i)ME" - --#: pgp.c:1497 -+#: pgp.c:1492 - msgid "(i)nline" - msgstr "(i)nline" - --#: pgp.c:1499 -+#: pgp.c:1494 - msgid "esabifc" - msgstr "zsabife" - - #. sign (a)s --#: pgp.c:1514 smime.c:1981 -+#: pgp.c:1509 smime.c:1981 - msgid "Sign as: " - msgstr "Podpisz jako: " - -@@ -3533,7 +3250,6 @@ msgid "Looking for keys matching \"%s\". - msgstr "Wyszukiwanie odpowiednich kluczy dla \"%s\"..." - - #: pop.c:90 pop_lib.c:201 --#, c-format - msgid "Command TOP is not supported by server." - msgstr "Polecenie TOP nie jest obs³ugiwane przez serwer." - -@@ -3542,7 +3258,6 @@ msgid "Can't write header to temporary f - msgstr "Nie mo¿na zapisaæ nag³ówka do pliku tymczasowego!" - - #: pop.c:198 pop_lib.c:203 --#, c-format - msgid "Command UIDL is not supported by server." - msgstr "Polecenie UIDL nie jest obs³ugiwane przez serwer." - -@@ -3606,7 +3321,6 @@ msgid "APOP authentication failed." - msgstr "Uwierzytelnianie APOP nie powiod³o siê." - - #: pop_auth.c:268 --#, c-format - msgid "Command USER is not supported by server." - msgstr "Polecenie USER nie jest obs³ugiwane przez serwer." - -@@ -3676,7 +3390,6 @@ msgid "Query command not defined." - msgstr "Pytanie nie zosta³o okre¶lone." - - #: query.c:290 --#, c-format - msgid "Query" - msgstr "Pytanie" - -@@ -3783,8 +3496,7 @@ msgstr "Przes³aæ dalej jako za³±czniki?" - - #: recvcmd.c:462 - msgid "Can't decode all tagged attachments. MIME-forward the others?" --msgstr "" --"Nie mo¿na zdekodowaæ zaznaczonych za³. Przes³aæ pozosta³e dalej (MIME)?" -+msgstr "Nie mo¿na zdekodowaæ zaznaczonych za³. Przes³aæ pozosta³e dalej (MIME)?" - - #: recvcmd.c:587 - msgid "Forward MIME encapsulated?" -@@ -3805,8 +3517,7 @@ msgstr "Nie znaleziono list pocztowych!" - - #: recvcmd.c:824 - msgid "Can't decode all tagged attachments. MIME-encapsulate the others?" --msgstr "" --"Nie mo¿na zdekodowaæ wszystkich wybranych za³. Za³±czyæ (MIME) pozosta³e?" -+msgstr "Nie mo¿na zdekodowaæ wszystkich wybranych za³. Za³±czyæ (MIME) pozosta³e?" - - #: remailer.c:484 - msgid "Append" -@@ -3859,8 +3570,7 @@ msgid "Mixmaster doesn't accept Cc or Bc - msgstr "Mixmaster nie akceptuje nag³ówków Cc i Bcc." - - #: remailer.c:738 --msgid "" --"Please set the hostname variable to a proper value when using mixmaster!" -+msgid "Please set the hostname variable to a proper value when using mixmaster!" - msgstr "Ustaw poprawn± warto¶æ hostname je¶li chcesz u¿ywaæ mixmastera!" - - #: remailer.c:772 -@@ -4018,16 +3728,16 @@ msgstr "%s nie jest zwyk³ym plikiem." - msgid "Could not open %s" - msgstr "Nie mo¿na otworzyæ %s" - --#: sendlib.c:2060 -+#: sendlib.c:2057 - #, c-format - msgid "Error sending message, child exited %d (%s)." - msgstr "B³±d podczas wysy³ania listu, proces potomny zwróci³ %d (%s)." - --#: sendlib.c:2066 -+#: sendlib.c:2063 - msgid "Output of the delivery process" - msgstr "Wynik procesu dostarczania" - --#: sendlib.c:2272 -+#: sendlib.c:2267 - #, c-format - msgid "Bad IDN %s while preparing resent-from." - msgstr "B³êdny IDN %s w trakcie przygotowywania resent-from." -@@ -4106,9 +3816,7 @@ msgstr "U¿yæ identyfikatora %s dla %s ?" - #: smime.c:637 - #, c-format - msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)" --msgstr "" --"Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by " --"kontynuowaæ)." -+msgstr "Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by kontynuowaæ)." - - #: smime.c:796 - #, c-format -@@ -4145,12 +3853,8 @@ msgid "No output from OpenSSL..." - msgstr "Brak wyników dzia³ania OpenSSL..." - - #: smime.c:1636 smime.c:1758 --msgid "" --"[-- End of OpenSSL output --]\n" --"\n" --msgstr "" --"[-- Koniec komunikatów OpenSSL --]\n" --"\n" -+msgid "[-- End of OpenSSL output --]\n\n" -+msgstr "[-- Koniec komunikatów OpenSSL --]\n\n" - - #: smime.c:1719 smime.c:1729 - msgid "[-- Error: unable to create OpenSSL subprocess! --]\n" -@@ -4165,34 +3869,23 @@ msgid "[-- The following data is S/MIME - msgstr "[-- Poni¿sze dane s± podpisane S/MIME --]\n" - - #: smime.c:1829 --msgid "" --"\n" --"[-- End of S/MIME encrypted data. --]\n" --msgstr "" --"\n" --"[-- Koniec danych zaszyfrowanych S/MIME. --]\n" -+msgid "\n[-- End of S/MIME encrypted data. --]\n" -+msgstr "\n[-- Koniec danych zaszyfrowanych S/MIME. --]\n" - - #: smime.c:1831 --msgid "" --"\n" --"[-- End of S/MIME signed data. --]\n" --msgstr "" --"\n" --"[-- Koniec danych podpisanych S/MIME. --]\n" -+msgid "\n[-- End of S/MIME signed data. --]\n" -+msgstr "\n[-- Koniec danych podpisanych S/MIME. --]\n" - - #: smime.c:1935 --msgid "" --"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? " --msgstr "" --"S/MIME: (z)aszyfruj, (p)odpisz, (m)etoda, podp. (j)ako, (o)ba, (a)nuluj?" -+msgid "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? " -+msgstr "S/MIME: (z)aszyfruj, (p)odpisz, (m)etoda, podp. (j)ako, (o)ba, (a)nuluj?" - - #: smime.c:1936 - msgid "eswabfc" - msgstr "zpmjoa" - - #: smime.c:1945 --msgid "" --"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? " -+msgid "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? " - msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, (a)nuluj? " - - #: smime.c:1947 -@@ -4217,15 +3910,9 @@ msgstr "(brak skrzynki)" - - #: thread.c:1089 - msgid "Parent message is not visible in this limited view." --msgstr "" --"Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania." -+msgstr "Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania." - - #: thread.c:1095 - msgid "Parent message is not available." - msgstr "Pierwszy list tego w±tku nie jest dostêpny." - --#~ msgid "unspecified protocol error" --#~ msgstr "nieznany b³±d protoko³u" -- --#~ msgid "Closing connection to IMAP server..." --#~ msgstr "Zamykanie po³±czenia z serwerem IMAP..." -Index: mutt/po/ru.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ru.po,v -retrieving revision 3.26 -retrieving revision 3.27 -diff -u -p -r3.26 -r3.27 ---- mutt/po/ru.po 13 Mar 2005 16:35:34 -0000 3.26 -+++ mutt/po/ru.po 22 Mar 2005 19:43:13 -0000 3.27 -@@ -10,10 +10,10 @@ - # - 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-03-13 17:38+0100\n" --"PO-Revision-Date: 2005-02-13 11:51+0200\n" -+"PO-Revision-Date: 2005-03-13 19:49+0200\n" - "Last-Translator: mutt-ru@woe.spb.ru\n" - "Language-Team: RUSSIAN \n" - "MIME-Version: 1.0\n" -@@ -213,9 +213,9 @@ msgid "Create is only supported for IMAP - 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" diff --git a/upstream/patches/cvs_2005-05-22 b/upstream/patches/cvs_2005-05-22 deleted file mode 100644 index 77b08a7..0000000 --- a/upstream/patches/cvs_2005-05-22 +++ /dev/null @@ -1,503 +0,0 @@ -Index: mutt/ChangeLog -=================================================================== -RCS file: /home/roessler/cvs/mutt/ChangeLog,v -retrieving revision 3.420 -retrieving revision 3.421 -diff -u -p -r3.420 -r3.421 ---- mutt/ChangeLog 3 Apr 2005 00:15:36 -0000 3.420 -+++ mutt/ChangeLog 10 Apr 2005 09:38:17 -0000 3.421 -@@ -1,3 +1,7 @@ -+2005-04-10 09:37:51 Johan Svedberg (roessler) -+ -+ * po/sv.po: update -+ - 2005-04-03 00:14:51 Daniel Jacobowitz (brendan) - - * imap/imap.c, imap/imap_private.h, imap/message.c: Synchronise -@@ -405,7 +409,7 @@ - 2005-01-29 19:15:07 Thomas Glanzmann (roessler) - - * hcache.c: - make hcache.c conform to mutt codingstyle -- - use $Id: ChangeLog,v 3.420 2005/04/03 00:15:36 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword -+ - use $Id: ChangeLog,v 3.421 2005/04/10 09:38:17 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword - - 2005-01-29 19:15:07 Thomas Glanzmann (roessler) - -Index: mutt/po/sv.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/sv.po,v -retrieving revision 3.19 -retrieving revision 3.20 -diff -u -p -r3.19 -r3.20 ---- mutt/po/sv.po 13 Mar 2005 16:35:35 -0000 3.19 -+++ mutt/po/sv.po 10 Apr 2005 09:37:51 -0000 3.20 -@@ -1,13 +1,12 @@ --# Swedish translation for Mutt. --# Copyright (C) 2004 Free Software Foundation, Inc. --# Johan Svedberg , 2004. -+# Swedish messages for Mutt. -+# Copyright (C) Johan Svedberg 2004-2005 - 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: 2004-08-17 14:16%z\n" --"Last-Translator: Johan Svedberg \n" -+"PO-Revision-Date: 2005-04-09 16:01+0200\n" -+"Last-Translator: Johan Svedberg \n" - "Language-Team: Swedish \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso-8859-1\n" -@@ -205,9 +204,8 @@ msgid "Create is only supported for IMAP - msgstr "Endast IMAP-brevlådor kan skapas" - - #: browser.c:880 --#, fuzzy - msgid "Rename is only supported for IMAP mailboxes" --msgstr "Endast IMAP-brevlådor kan skapas" -+msgstr "Endast IMAP-brevlådor kan döpas om" - - #: browser.c:901 - msgid "Delete is only supported for IMAP mailboxes" -@@ -289,19 +287,19 @@ msgstr "%s: kommandot är endast giltigt - #: color.c:393 - #, c-format - msgid "%s: too few arguments" --msgstr "%s: för få argument" -+msgstr "%s: för få parametrar" - - #: color.c:567 - msgid "Missing arguments." --msgstr "Saknar argument." -+msgstr "Parametrar saknas." - - #: color.c:606 color.c:617 - msgid "color: too few arguments" --msgstr "color: för få argument" -+msgstr "color: för få parametrar" - - #: color.c:640 - msgid "mono: too few arguments" --msgstr "mono: för få argument" -+msgstr "mono: för få parametrar" - - #: color.c:660 - #, c-format -@@ -310,11 +308,11 @@ msgstr "%s: attributet finns inte" - - #: color.c:700 hook.c:69 hook.c:77 keymap.c:748 - msgid "too few arguments" --msgstr "för få argument" -+msgstr "för få parametrar" - - #: color.c:709 hook.c:83 - msgid "too many arguments" --msgstr "för många argument" -+msgstr "för många parametrar" - - #: color.c:725 - msgid "default colors not supported" -@@ -746,7 +744,7 @@ msgstr "Brevet skickades inte." - - #: crypt.c:398 - msgid "S/MIME messages with no hints on content are unsupported." --msgstr "S/MIME-meddelanden utan ledtrådar på innehåll stöds inte." -+msgstr "S/MIME-meddelanden utan ledtrådar till innehållet stöds ej." - - #: crypt.c:617 crypt.c:661 - msgid "Trying to extract PGP keys...\n" -@@ -842,11 +840,11 @@ msgstr "Inga meddelanden." - - #: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44 - msgid "Mailbox is read-only." --msgstr "Brevlåda är skrivskyddad." -+msgstr "Brevlådan är skrivskyddad." - - #: curs_main.c:54 pager.c:59 recvattach.c:873 - msgid "Function not permitted in attach-message mode." --msgstr "Funktion inte tillåten i \"bifoga-meddelnande\"-läge." -+msgstr "Funktionen ej tillåten i \"bifoga-meddelande\"-läge." - - #: curs_main.c:55 - msgid "No visible messages." -@@ -858,11 +856,11 @@ msgstr "Kan inte växla till skrivläge på - - #: curs_main.c:255 - msgid "Changes to folder will be written on folder exit." --msgstr "Ändringar i foldern kommer att skrivas när foldern stängs." -+msgstr "Ändringarna i foldern skrivs när foldern lämnas." - - #: curs_main.c:260 - msgid "Changes to folder will not be written." --msgstr "Ändringar i foldern kommer inte att skrivas." -+msgstr "Ändringarna i foldern kommer inte att skrivas." - - #: curs_main.c:401 - msgid "Quit" -@@ -886,7 +884,7 @@ msgstr "Grupp" - - #: curs_main.c:496 - msgid "Mailbox was externally modified. Flags may be wrong." --msgstr "Brevlådan blev externt modifierad. Flaggor kan vara felaktiga." -+msgstr "Brevlådan har ändrats externt. Flaggor kan vara felaktiga." - - #: curs_main.c:499 - msgid "New mail in this mailbox." -@@ -894,7 +892,7 @@ msgstr "Nya brev i den här brevlådan." - - #: curs_main.c:503 - msgid "Mailbox was externally modified." --msgstr "Brevlådan blev externt modifierad." -+msgstr "Brevlådan har ändrats externt." - - #: curs_main.c:621 - msgid "No tagged messages." -@@ -910,7 +908,7 @@ msgstr "Hoppa till meddelande: " - - #: curs_main.c:749 - msgid "Argument must be a message number." --msgstr "Argumentet måste vara ett meddelandenummer." -+msgstr "Parametern måste vara ett meddelandenummer." - - #: curs_main.c:782 - msgid "That message is not visible." -@@ -926,7 +924,7 @@ msgstr "Radera meddelanden som matchar: - - #: curs_main.c:826 - msgid "No limit pattern is in effect." --msgstr "Inget begränsande mönster är aktivt." -+msgstr "Inget avgränsande mönster är aktivt." - - #. i18n: ask for a limit to apply - #: curs_main.c:831 -@@ -936,7 +934,7 @@ msgstr "Gräns: %s" - - #: curs_main.c:841 - msgid "Limit to messages matching: " --msgstr "Begränsa till meddelanden som matchar: " -+msgstr "Visa endast meddelanden som matchar: " - - #: curs_main.c:873 - msgid "Quit Mutt?" -@@ -985,11 +983,11 @@ msgstr "Du är på det första meddelandet. - - #: curs_main.c:1342 pattern.c:1296 - msgid "Search wrapped to top." --msgstr "Sökning fortsatte i början." -+msgstr "Sökning fortsatte från början." - - #: curs_main.c:1351 pattern.c:1307 - msgid "Search wrapped to bottom." --msgstr "Sökning fortsatte i slutet." -+msgstr "Sökning fortsatte från slutet." - - #: curs_main.c:1392 - msgid "No new messages" -@@ -1018,7 +1016,7 @@ msgstr "Du är på den första tråden." - #: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077 - #: thread.c:1132 - msgid "Threading is not enabled." --msgstr "Trådning är inte aktiverad." -+msgstr "Trådning ej aktiverat." - - #: curs_main.c:1624 - msgid "Thread contains unread messages." -@@ -1053,7 +1051,7 @@ msgid "" - "~?\t\tthis message\n" - ".\t\ton a line by itself ends input\n" - msgstr "" --"~~\t\tinfoga en rad som börjar med ett ~\n" -+"~~\t\tinfoga en rad som börjar med ett ~\n" - "~b adresser\tlägg till adresser till Bcc:-fältet\n" - "~c adresser\tlägg till adresser till Cc:-fältet\n" - "~f meddelanden\tbifoga meddelanden\n" -@@ -1099,7 +1097,7 @@ msgstr "saknar filnamn.\n" - - #: edit.c:427 - msgid "No lines in message.\n" --msgstr "Inga rader i meddelande.\n" -+msgstr "Inga rader i meddelandet.\n" - - #: edit.c:444 - #, c-format -@@ -1109,7 +1107,7 @@ msgstr "Dåligt IDN i %s: \"%s\"\n" - #: edit.c:462 - #, c-format - msgid "%s: unknown editor command (~? for help)\n" --msgstr "%s: okänt redigerarkommando (~? för hjälp)\n" -+msgstr "%s: okänt redigeringskommando (~? för hjälp)\n" - - #: editmsg.c:78 - #, c-format -@@ -1124,7 +1122,7 @@ msgstr "kunde inte skriva tillfällig bre - #: editmsg.c:107 - #, c-format - msgid "could not truncate temporary mail folder: %s" --msgstr "kunde inte stympa tillfällig brevfolder: %s" -+msgstr "kunde inte avkorta tillfällig brevfolder: %s" - - #: editmsg.c:122 - msgid "Message file is empty!" -@@ -1230,13 +1228,13 @@ msgid "" - "[-- and the indicated external source has --]\n" - "[-- expired. --]\n" - msgstr "" --"[-- och den indikerade externa källan har --]\n" -+"[-- och den angivna externa källan har --]\n" - "[-- utgått. --]\n" - - #: handler.c:1714 - #, c-format - msgid "[-- and the indicated access-type %s is unsupported --]\n" --msgstr "[-- och den indikerade åtkomsttypen %s stöds inte --]\n" -+msgstr "[-- och den angivna åtkomsttypen %s stöds inte --]\n" - - #: handler.c:1822 - msgid "Error: multipart/signed has no protocol." -@@ -1397,19 +1395,18 @@ msgid "Mailbox created." - msgstr "Brevlåda skapad." - - #: imap/browse.c:325 --#, fuzzy, c-format -+#, c-format - msgid "Rename mailbox %s to: " --msgstr "Skapa brevlåda: " -+msgstr "Döp om brevlådan %s till: " - - #: imap/browse.c:338 --#, fuzzy, c-format -+#, c-format - msgid "Rename failed: %s" --msgstr "SSL misslyckades: %s" -+msgstr "Kunde ej döpa om: %s" - - #: imap/browse.c:343 --#, fuzzy - msgid "Mailbox renamed." --msgstr "Brevlåda skapad." -+msgstr "Brevlåda omdöpt." - - #: imap/command.c:294 - msgid "Mailbox closed" -@@ -1515,9 +1512,9 @@ msgid "Could not create temporary file % - msgstr "Kunde inte skapa tillfällig fil %s" - - #: imap/message.c:134 --#, fuzzy, c-format -+#, c-format - msgid "Evaluating cache... [%d/%d]" --msgstr "Hämtar meddelandehuvuden... [%d/%d]" -+msgstr "Utvärderar cache... [%d/%d]" - - #: imap/message.c:202 pop.c:210 - #, c-format -@@ -1680,12 +1677,12 @@ msgstr "Oändlig slinga i macro upptäckt. - - #: keymap.c:673 keymap.c:681 - msgid "Key is not bound." --msgstr "Tangent är inte knuten." -+msgstr "Tangenten är inte knuten." - - #: keymap.c:685 - #, c-format - msgid "Key is not bound. Press '%s' for help." --msgstr "Tangent är inte knuten. Tryck \"%s\" för hjälp." -+msgstr "Tangenten är inte knuten. Tryck \"%s\" för hjälp." - - #: keymap.c:696 - msgid "push: too many arguments" -@@ -1817,7 +1814,7 @@ msgstr "redigera CC-listan" - - #: keymap_alldefs.h:25 - msgid "edit attachment description" --msgstr "redigera bilagabeskrivning" -+msgstr "redigera bilagebeskrivning" - - #: keymap_alldefs.h:26 - msgid "edit attachment transfer-encoding" -@@ -1853,7 +1850,7 @@ msgstr "redigera Reply-To-fältet" - - #: keymap_alldefs.h:34 - msgid "edit the subject of this message" --msgstr "redigera ärendet på det här meddelandet" -+msgstr "redigera ämnet på det här meddelandet" - - #: keymap_alldefs.h:35 - msgid "edit the TO list" -@@ -1901,7 +1898,7 @@ msgstr "växla dispositionen mellan integ - - #: keymap_alldefs.h:46 - msgid "toggle whether to delete file after sending it" --msgstr "växla huruvida fil ska tas bort efter att den har sänts" -+msgstr "växla om fil ska tas bort efter att den har sänts" - - #: keymap_alldefs.h:47 - msgid "update an attachment's encoding info" -@@ -1917,7 +1914,7 @@ msgstr "kopiera ett meddelande till en f - - #: keymap_alldefs.h:50 - msgid "create an alias from a message sender" --msgstr "skapa ett alias från ett meddelandes avsändare" -+msgstr "skapa ett alias från avsändaren av ett meddelande" - - #: keymap_alldefs.h:51 - msgid "move entry to bottom of screen" -@@ -1957,7 +1954,7 @@ msgstr "radera alla meddelanden i tråd" - - #: keymap_alldefs.h:60 - msgid "display full address of sender" --msgstr "visa hela avsändarens adress" -+msgstr "visa avsändarens fullständiga adress" - - #: keymap_alldefs.h:61 - msgid "display message and toggle header weeding" -@@ -1969,7 +1966,7 @@ msgstr "visa ett meddelande" - - #: keymap_alldefs.h:63 - msgid "edit the raw message" --msgstr "ändra i meddelandet" -+msgstr "ändra i själva meddelandet" - - #: keymap_alldefs.h:64 - msgid "delete the char in front of the cursor" -@@ -2229,7 +2226,7 @@ msgstr "sätt en statusflagga på ett medd - - #: keymap_alldefs.h:128 - msgid "save changes to mailbox" --msgstr "spara ändringar till brevlåda" -+msgstr "spara ändringar av brevlåda" - - #: keymap_alldefs.h:129 - msgid "tag messages matching a pattern" -@@ -2320,9 +2317,8 @@ msgid "{internal}" - msgstr "{internt}" - - #: keymap_alldefs.h:151 --#, fuzzy - msgid "rename the current mailbox (IMAP only)" --msgstr "radera den aktuella brevlådan (endast för IMAP)" -+msgstr "döp om den aktuella brevlådan (endast för IMAP)" - - #: keymap_alldefs.h:152 - msgid "reply to a message" -@@ -2330,7 +2326,7 @@ msgstr "svara på ett meddelande" - - #: keymap_alldefs.h:153 - msgid "use the current message as a template for a new one" --msgstr "använd det aktuella meddelande som en mall för ett nytt" -+msgstr "använd det aktuella meddelande som mall för ett nytt" - - #: keymap_alldefs.h:154 - msgid "save message/attachment to a file" -@@ -2410,11 +2406,11 @@ msgstr "återställ den aktuella posten" - - #: keymap_alldefs.h:173 - msgid "undelete all messages in thread" --msgstr "återställ all meddelanden i tråd" -+msgstr "återställ all meddelanden i tråden" - - #: keymap_alldefs.h:174 - msgid "undelete all messages in subthread" --msgstr "återställ alla meddelanden i undertråd" -+msgstr "återställ alla meddelanden i undertråden" - - #: keymap_alldefs.h:175 - msgid "show the Mutt version number and date" -@@ -2601,7 +2597,6 @@ msgstr "" - "USA.\n" - - #: main.c:99 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -2649,7 +2644,7 @@ msgstr "" - " mutt -v[v]\n" - "\n" - "options:\n" --" -A \texpandera den givna aliaset\n" -+" -A \texpandera det givna aliaset\n" - " -a \tbifoga en fil till meddelandet\n" - " -b \tange en \"blind carbon-copy\" (BCC) adress\n" - " -c \tange en \"carbon-copy\" (CC) adress\n" -@@ -2740,7 +2735,7 @@ msgstr "Brevlådan blev skadad!" - - #: mbox.c:699 mbox.c:953 - msgid "Fatal error! Could not reopen mailbox!" --msgstr "Fatalt fel! Kunde inte återöppna brevlåda!" -+msgstr "Fatalt fel! Kunde inte öppna brevlådan igen!" - - #: mbox.c:708 - msgid "Unable to lock mailbox!" -@@ -2869,7 +2864,7 @@ msgstr "maildir_commit_message(): kunde - - #: muttlib.c:846 - msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" --msgstr "Filen är en katalog, spar i den? [(j)a, n(ej), (a)lla]" -+msgstr "Filen är en katalog, spara i den? [(j)a, n(ej), (a)lla]" - - #: muttlib.c:846 - msgid "yna" -@@ -2877,7 +2872,7 @@ msgstr "jna" - - #: muttlib.c:862 - msgid "File is a directory, save under it?" --msgstr "Filen är en katalog, spar i den?" -+msgstr "Filen är en katalog, spara i den?" - - #: muttlib.c:868 - msgid "File under directory: " -@@ -3646,11 +3641,11 @@ msgstr "Otillåtet S/MIME-huvud" - - #: postpone.c:556 - msgid "Decrypting message..." --msgstr "Dekrypterar meddelande..." -+msgstr "Avkrypterar meddelande..." - - #: postpone.c:565 - msgid "Decryption failed." --msgstr "Dekryptering misslyckades." -+msgstr "Avkryptering misslyckades." - - #: query.c:50 - msgid "New Query" -@@ -3751,11 +3746,11 @@ msgstr "Kan inte radera bilaga från POP- - - #: recvattach.c:1075 - msgid "Deletion of attachments from encrypted messages is unsupported." --msgstr "Radering av bilagor från krypterade meddelanden saknar stöd." -+msgstr "Radering av bilagor från krypterade meddelanden stöds ej." - - #: recvattach.c:1094 recvattach.c:1111 - msgid "Only deletion of multipart attachments is supported." --msgstr "Endast radering av \"multipart\"-bilagor har stöd." -+msgstr "Endast radering av \"multipart\"-bilagor stöds." - - #: recvcmd.c:47 - msgid "You may only bounce message/rfc822 parts." -@@ -3893,11 +3888,11 @@ msgstr "score: för många parametrar" - - #: send.c:252 - msgid "No subject, abort?" --msgstr "Inget ärende, avbryt?" -+msgstr "Inget ämne, avbryt?" - - #: send.c:254 - msgid "No subject, aborting." --msgstr "Inget ärende, avbryter." -+msgstr "Inget ämne, avbryter." - - #. There are quite a few mailing lists which set the Reply-To: - #. * header field to the list address, which makes it quite impossible -@@ -4225,9 +4220,3 @@ msgstr "Första meddelandet är inte synli - #: thread.c:1095 - msgid "Parent message is not available." - msgstr "Första meddelandet är inte tillgängligt." -- --#~ msgid "unspecified protocol error" --#~ msgstr "ospecificerat protokollfel" -- --#~ msgid "Closing connection to IMAP server..." --#~ msgstr "Stänger anslutning till IMAP-server..."