This commit was manufactured by cvs2git to create branch 'RAW'.

[packages/mutt.git] / mutt-vvv.quote.patch

diff --git a/mutt-vvv.quote.patch b/mutt-vvv.quote.patch
deleted file mode 100644 (file)
index 52d0432..0000000
--- a/mutt-vvv.quote.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -udprP mutt-1.5.19.orig/globals.h mutt-1.5.19/globals.h
---- mutt-1.5.19.orig/globals.h 2009-01-04 01:27:10.000000000 +0200
-+++ mutt-1.5.19/globals.h      2009-01-06 19:40:35.000000000 +0200
-@@ -24,6 +24,8 @@ WHERE CONTEXT *Context;
- WHERE char Errorbuf[STRING];
- WHERE char AttachmentMarker[STRING];
- 
-+WHERE char Quotebuf[SHORT_STRING];
-+
- #if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
- WHERE char *MuttDotlock;
- #endif
-diff -udprP mutt-1.5.19.orig/handler.c mutt-1.5.19/handler.c
---- mutt-1.5.19.orig/handler.c 2009-01-05 21:20:53.000000000 +0200
-+++ mutt-1.5.19/handler.c      2009-01-06 19:40:35.000000000 +0200
-@@ -90,6 +90,8 @@ static void mutt_convert_to_state(iconv_
-       if (ob != bufo)
-       state_prefix_put (bufo, ob - bufo, s);
-     }
-+    if (Quotebuf[0] != '\0')
-+      state_prefix_putc ('\n', s);
-     return;
-   }
- 
-@@ -1473,6 +1475,8 @@ void mutt_decode_attachment (BODY *b, ST
-   int istext = mutt_is_text_part (b);
-   iconv_t cd = (iconv_t)(-1);
- 
-+  Quotebuf[0] = '\0';
-+
-   if (istext && s->flags & M_CHARCONV)
-   {
-     char *charset = mutt_get_parameter ("charset", b->parameter);
-@@ -1542,7 +1546,7 @@ int mutt_body_handler (BODY *b, STATE *s
-        */
-       if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
-       handler = crypt_pgp_application_pgp_handler;
--      else if (ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
-+      else if (ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
-       handler = rfc3676_handler;
-       else
-       plaintext = 1;
-diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h
---- mutt-1.5.19.orig/init.h    2009-01-05 21:20:53.000000000 +0200
-+++ mutt-1.5.19/init.h 2009-01-06 19:40:35.000000000 +0200
-@@ -2451,6 +2451,19 @@ struct option_t MuttVars[] = {
-   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
-   ** prompted for confirmation when you try to quit.
-   */
-+  { "quote_empty",    DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
-+  /*
-+  ** .pp
-+  ** Controls whether or not empty lines will be quoted using
-+  ** ``$indent_string''.
-+  */
-+  { "quote_quoted",   DT_BOOL, R_NONE, OPTQUOTEQUOTED, 0 },
-+  /*
-+  ** .pp
-+  ** Controls how quoted lines will be quoted. If set, one quote
-+  ** character will be added to the end of existing prefix.  Otherwise,
-+  ** quoted lines will be prepended by ``$indent_string''.
-+  */
-   { "quote_regexp",   DT_RX,   R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+" },
-   /*
-   ** .pp
-diff -udprP mutt-1.5.19.orig/mutt.h mutt-1.5.19/mutt.h
---- mutt-1.5.19.orig/mutt.h    2008-09-26 01:00:03.000000000 +0300
-+++ mutt-1.5.19/mutt.h 2009-01-06 19:40:35.000000000 +0200
-@@ -398,6 +398,8 @@ enum
-   OPTPRINTDECODE,
-   OPTPRINTSPLIT,
-   OPTPROMPTAFTER,
-+  OPTQUOTEEMPTY,
-+  OPTQUOTEQUOTED,
-   OPTREADONLY,
-   OPTREPLYSELF,
-   OPTRESOLVE,
-diff -udprP mutt-1.5.19.orig/muttlib.c mutt-1.5.19/muttlib.c
---- mutt-1.5.19.orig/muttlib.c 2009-01-05 21:20:53.000000000 +0200
-+++ mutt-1.5.19/muttlib.c      2009-01-06 19:40:35.000000000 +0200
-@@ -1497,15 +1497,45 @@ void state_prefix_putc (char c, STATE *s
- {
-   if (s->flags & M_PENDINGPREFIX)
-   {
--    state_reset_prefix (s);
--    if (s->prefix)
--      state_puts (s->prefix, s);
--  }
-+    int i;
- 
--  state_putc (c, s);
-+    i = strlen (Quotebuf);
-+    Quotebuf[i++] = c;
-+    Quotebuf[i] = '\0';
-+    if (i == sizeof (Quotebuf) - 1 || c == '\n')
-+    {
-+      char buf[2 * SHORT_STRING];
-+      int j = 0, offset = 0;
-+      regmatch_t pmatch[1];
-+
-+      state_reset_prefix (s);
-+      while (regexec ((regex_t *) QuoteRegexp.rx, &Quotebuf[offset], 1, pmatch, 0) == 0)
-+      offset += pmatch->rm_eo;
-+
-+      if (!option (OPTQUOTEEMPTY) && Quotebuf[0] == '\n')
-+      strcpy (buf, Quotebuf);
-+      else if (option (OPTQUOTEQUOTED) && offset)
-+      {
-+      for (i = 0; i < offset; i++)
-+        if (Quotebuf[i] != ' ')
-+          j = i;
-+      strncpy (buf, Quotebuf, j + 1);
-+      strcpy (buf + j + 1, Quotebuf + j);
-+      }
-+      else
-+      snprintf (buf, sizeof (buf), "%s%s", NONULL(s->prefix), Quotebuf);
-+
-+      state_puts (buf, s);
-+    }
-+  }
-+  else
-+    state_putc (c, s);
- 
-   if (c == '\n')
-+  {
-     state_set_prefix (s);
-+    Quotebuf[0] = '\0';
-+  }
- }
- 
- int state_printf (STATE *s, const char *fmt, ...)
-diff -udprP mutt-1.5.19.orig/PATCHES mutt-1.5.19/PATCHES
---- mutt-1.5.19.orig/PATCHES   2008-03-19 22:07:06.000000000 +0200
-+++ mutt-1.5.19/PATCHES        2009-01-06 19:40:35.000000000 +0200
-@@ -0,0 +1 @@
-+vvv.quote