X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=711b3d8ed8158cb3577fded2d59e48a4f7548800;hp=0340d20d67a4ad9987de509e74056abd0c50238f;hb=31edbe030ac69952aa535730427246b5e9a1603c;hpb=079475507f097b263fcd3037c8ee10f4b0dae325

diff --git a/muttlib.c b/muttlib.c
index 0340d20..711b3d8 100644
--- 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++)