Add demo mutt_xtitle script

diff --git a/ChangeLog b/ChangeLog
index e5e0a54965640650e112cc05db769bc0f62da81c..0b901d0baeac363599f5f95ee5f8ed250b1b542c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,28 @@
+2007-03-14 13:57 -0700  Brendan Cully  <brendan@kublai.com>  (67c017c8af80)
+
+       * muttlib.c: Remove trailing newlines from fmtpipe return value.
+       Increase fmtpipe logging level to 3.
+
+2007-03-14 13:49 -0700  David Champion  <dgc@uchicago.edu>  (63ad6be01750)
+
+       * mutt.h, muttlib.c: Allow format strings to be filtered. Any format
+       string ending in | will be expanded and piped through the first word
+       in the string. The string returned will be used for display. If the
+       returned string ends in %, it will be passed through the formatter a
+       second time. This allows the filter to generate a replacement format
+       string including % expandos.
+
+2007-03-14 13:26 -0700  Brendan Cully  <brendan@kublai.com>  (e9203a364537)
+
+       * imap/imap.c: Recheck capabilities after authentication (closes:
+       #2837)
+
 2007-03-14 13:09 -0700  Christoph Berg  <cb@df7cb.de>  (cbacb14a837a)
 
        * doc/mutt.man, main.c: mutt.man and mutt -h updates
 
-       the following patch documents mutt --, removes the reference to
-       flea, and generally updates the mutt.1 manpage.
+       Document mutt --, remove the reference to
+       flea, and generally update the mutt.1 manpage.
 
        (I removed -d from the SYNOPSIS part since it wasn't entirely
        correct syntactically there and putting it elsewhere seems like

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 363e7928d3ba49cc95d87a51b7552311f32f6a51..f6e67d42f00c951b4463139ea210c79bafcf9bf4 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -5,7 +5,7 @@ subdir = contrib
 SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
        sample.muttrc  sample.mailcap sample.muttrc-tlr \
        colors.default colors.linux smime.rc \
-       ca-bundle.crt smime_keys_test.pl
+       ca-bundle.crt smime_keys_test.pl mutt_xtitle
 
 EXTRA_DIST = language.txt language50.txt  \
        patch.slang-1.2.2.keypad.1      \

diff --git a/contrib/mutt_xtitle b/contrib/mutt_xtitle
new file mode 100755 (executable)
index 0000000..f9b8a23
--- /dev/null
+++ b/contrib/mutt_xtitle
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Demonstration of format string pipes. Sets the xterm title and returns the
+# string unchanged.
+#
+# Example usage:
+# set status_format="mutt_xtitle '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|"
+
+printf "\033]0;$1\007" > /dev/tty
+echo "$1"

diff --git a/muttlib.c b/muttlib.c
index d448831a01cf84cd271a4123246aba8f48226b04..32495f3e6e786bf856c79d9c749bc1cf99a43ed0 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1096,7 +1096,7 @@ void mutt_FormatString (char *dest,               /* output buffer */
             if (recycler)
             {
               mutt_FormatString(dest, destlen++, recycler, callback, data, flags);
-              safe_free(&recycler);
+              FREE(&recycler);
             }
           }
         }