Maintain different history lists for files and mailboxes. Closes #2999.

diff --git a/ChangeLog b/ChangeLog
index 919d597e98da60d409d6cd1f2fa8888f187ca694..3c019e543a910701902556c1bda0cff9d889f417 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2007-12-11 13:08 +0100  Rocco Rutte  <pdmef@gmx.net>  (35d778452444)
+
+       * history.c: Do not trust history file and mutt code about history
+       class. This prevents crashes as result of programming errors and/or
+       wrong history file (e.g. negative or too high classes).
+
+2007-12-08 12:54 -0800  Michael Elkins  <me@mutt.org>  (3971bcfd9112)
+
+       * mh.c: Skip over messages which were previously parsed after sorting
+       the tail of the list. Avoids a segmentation fault when rescanning
+       the new/ subdir of a maildir when messages were left over from a
+       previous scan.
+
+2007-12-07 11:38 -0800  Rocco Rutte  <pdmef@gmx.net>  (b891b1736885)
+
+       * ChangeLog, lib.c, md5.h: Check definition of ENOTSUP before use
+       (closes #2983)
+
 2007-12-07 13:09 +0100  Rocco Rutte  <pdmef@gmx.net>  (468b9c86b0df)
 
        * mh.c: Sort MH folders into natural order after 2nd pass (closes

diff --git a/enter.c b/enter.c
index 7eef008a3077568bc83e260dd871cc7431081cab..3e4d4e668df02dd0c702cb392685ee92881a236e 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -244,8 +244,10 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
     redraw = M_REDRAW_INIT;
   }
 
-  if (flags & (M_FILE | M_EFILE))
+  if (flags & M_FILE)
     hclass = HC_FILE;
+  else if (flags & M_EFILE)
+    hclass = HC_MBOX;
   else if (flags & M_CMD)
     hclass = HC_CMD;
   else if (flags & M_ALIAS)

diff --git a/history.h b/history.h
index 5c9220cbfc2e7d9e70b3d32280d0cef1ee208ea1..0bd37ddb3dcdc9cac52a52e224d07a272570f596 100644 (file)
--- a/history.h
+++ b/history.h
@@ -27,6 +27,8 @@ enum history_class
   HC_FILE,
   HC_PATTERN,
   HC_OTHER,
+  HC_MBOX,
+  /* insert new items here to keep history file working */
   HC_LAST
 };