Disallow breaking threads for messages not part of a thread

diff --git a/ChangeLog b/ChangeLog
index 61862adbb0660086076a13af8c459b4c03c50d90..0ec1da4dade0f39ef7db1d06a000cff6859481d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2009-06-20 15:22 +0200  Rocco Rutte  <pdmef@gmx.net>  (580ab0256c49)
+
+       * doc/manual.xml.head: Manual: Clarify and extend variable type
+       conversion section
+
+2009-06-19 19:56 -0400  Aron Griffis  <agriffis@n01se.net>  (ee3d174297bb)
+
+       * rfc822.c: remove bogus FREE
+
+       It's impossible for cur->personal to be non-NULL at this point,
+       since cur was calloc'd just a couple lines prior.
+
+       Signed-off-by: Aron Griffis <agriffis@n01se.net>
+
+2009-06-19 22:49 +0200  Rocco Rutte  <pdmef@gmx.net>  (9ae13dedb5ed)
+
+       * mbox.c, mx.c, mx.h: Fixup atime for mbox/mmdf also when mailbox is
+       unchanged but has new mail. See #1362.
+
+2009-06-19 19:27 +0200  Rocco Rutte  <pdmef@gmx.net>  (bd59be56c6b0)
+
+       * ChangeLog, mbox.c: Don't mangle atime/mtime for mbox folders without
+       new mail upon sync. Closes #1362, #3271.
+
 2009-06-19 19:23 +0200  Rocco Rutte  <pdmef@gmx.net>  (0fd362c870b8)
 
        * doc/manual.xml.head: Manual: Add note and example for type

diff --git a/curs_main.c b/curs_main.c
index b701d91b6378b85f9dd3d5a782fd5af93bbb07b6..7ab2d46125cec0ec0ee54ee2e251981f780d614d 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -1220,7 +1220,7 @@ int mutt_index_menu (void)
 
         if ((Sort & SORT_MASK) != SORT_THREADS)
          mutt_error _("Threading is not enabled.");
-       else
+       else if (CURHDR->env->in_reply_to || CURHDR->env->references)
        {
          {
            HEADER *oldcur = CURHDR;
@@ -1241,8 +1241,10 @@ int mutt_index_menu (void)
          else
            menu->redraw |= REDRAW_INDEX;
        }
+       else
+         mutt_error _("Thread cannot be broken, message is not part of a thread");
 
-         break;
+       break;
 
       case OP_MAIN_LINK_THREADS: