Undo breakage I introduced in VL's doc reldate patch.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9a500faf6eaa5887f25bad742095c6089273d368..f6790b1eb2fe8a2299c9095c61c4bd7a20ccaaa5 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -182,9 +182,9 @@ mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
 
 stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/init.h manual.xml.head manual.xml.tail \
-               $(top_srcdir)/VERSION ../reldate.h
+               $(top_srcdir)/VERSION $(top_srcdir)/reldate.h
        $(MAKE) ../makedoc$(EXEEXT)
-       ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` (`cut -d\\" -f2 ../reldate.h`)/" $(srcdir)/manual.xml.head ;\
+       ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` (`cut -d\\" -f2 $(top_srcdir)/reldate.h`)/" $(srcdir)/manual.xml.head ;\
          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
                cat - $(srcdir)/manual.xml.tail > manual.xml
        touch stamp-doc-xml

diff --git a/init.c b/init.c
index dcb63d9999ffeba447827938cc3bcc38f3fd05d7..4259c70150676b0ac917c06d7c9f780550d50c4a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -50,7 +50,7 @@
 #include <sys/wait.h>
 
 #define CHECK_PAGER \
-       if ((CurrentMenu == MENU_PAGER) && \
+  if ((CurrentMenu == MENU_PAGER) && (idx >= 0) &&     \
            (MuttVars[idx].flags & R_RESORT)) \
        { \
          snprintf (err->data, err->dsize, \
@@ -1756,7 +1756,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
        CHECK_PAGER;
         if (myvar)
           myvar_del (myvar);
-        else if (DTYPE (MuttVars[idx].type) == DT_ADDR)
+       else if (DTYPE (MuttVars[idx].type) == DT_ADDR)
          rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
        else
          /* MuttVars[idx].data is already 'char**' (or some 'void**') or... 
@@ -1800,12 +1800,12 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
        CHECK_PAGER;
         s->dptr++;
 
-        /* copy the value of the string */
         if (myvar)
-        {
-          myvar = safe_strdup (myvar);
+       {
+         /* myvar is a pointer to tmp and will be lost on extract_token */
+         myvar = safe_strdup (myvar);
           myvar_del (myvar);
-        }
+       }
         else if (DTYPE (MuttVars[idx].type) == DT_ADDR)
          rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
         else
@@ -1818,6 +1818,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
         {
           myvar_set (myvar, tmp->data);
           FREE (&myvar);
+         myvar="don't resort";
         }
         else if (DTYPE (MuttVars[idx].type) == DT_PATH)
         {