Remove trailing slash from $folder in mutt_expand_path.

diff --git a/ChangeLog b/ChangeLog
index c0bb8a9192b6086139cc31ebe0054e3d96b5f5a0..9c9eb47071524a9f0b994830ae1f83ec59efa810 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2007-03-20 08:20 -0700  Rocco Rutte  <pdmef@gmx.net>  (3122a4a338b1)
+
+       * rfc3676.c: Make f=f handler behave like old f=f handler for quoted
+       lines Now lines containing quote characters but no further content
+       appear as quoted lines again for making replies. Also, the spaces
+       between quotes and text are removed to make output look as it did
+       for the old handler.
+
+2007-03-19 08:12 -0700  Rocco Rutte  <pdmef@gmx.net>  (5681216fa395)
+
+       * doc/manual.xml.head: Manual: f=f messages are text/plain, not "plain
+       ASCII"
+
+2007-03-16 11:21 -0700  Michael Elkins  <me@mutt.org>  (aa96e6137c69)
+
+       * imap/imap.c: Fixed segfault when attempting to open an imaps mailbox
+       when mutt is not configured with SSL support.
+
+2007-03-16 09:39 -0700  Brendan Cully  <brendan@kublai.com>  (08f9bb4b7810)
+
+       * configure.ac, configure.in: Move configure.in to configure.ac
+
+2007-03-15 16:29 -0700  Brendan Cully  <brendan@kublai.com>  (4ade0c9660d5)
+
+       * ChangeLog, Makefile.am: Add reldate.h to BUILT_SOURCES
+
 2007-03-15 16:10 +0100  Christoph Berg  <cb@df7cb.de>  (ed804d94676a)
 
        * Makefile.am: Remove reldate.h from EXTRADIST to fix out-of-tree

diff --git a/muttlib.c b/muttlib.c
index 32495f3e6e786bf856c79d9c749bc1cf99a43ed0..6ab496c4565784fc5fb84234fe419a073568f4db 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -397,6 +397,9 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
          strfcpy (p, NONULL (Maildir), sizeof (p));
        else
 #endif
+       if (Maildir[strlen (Maildir) - 1] == '/')
+         strfcpy (p, NONULL (Maildir), sizeof (p));
+       else
          snprintf (p, sizeof (p), "%s/", NONULL (Maildir));
        
        tail = s + 1;