Rocco Rutte:

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 0340d20..711b3d8 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -456,6 +456,13 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
       }
       break;
       
+      case '^':
+      {
+        strfcpy (p, NONULL(CurrentFolder), sizeof (p));
+        tail = s + 1;
+      }
+      break;
+ 
       default:
       {
        *p = '\0';
@@ -1311,8 +1318,10 @@ void state_prefix_putc (char c, STATE *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);
+      if (!option (OPTQUOTEEMPTY) && Quotebuf[offset] == '\n') {
+        buf[0] = '\n';
+        buf[1] = '\0';
+      }
       else if (option (OPTQUOTEQUOTED) && offset)
       {
        for (i = 0; i < offset; i++)