Commit 0430a647 authored by Brendan Cully's avatar Brendan Cully

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

parent 793274e6
......@@ -182,9 +182,9 @@ mutt.1: $(srcdir)/mutt.man
$(EDIT) $(srcdir)/mutt.man > [email protected]
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
......@@ -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)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment