Rocco Rutte:

tiny fixes and made makedoc shout much less

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@107 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/Makefile.am b/Makefile.am
index 2c7e37e..50d6bad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,7 +150,7 @@ install-data-local: Muttngrc
        elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
                $(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
        fi
        elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
                $(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
        fi

-       -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
+       -if [ ! -f $(DESTDIR)$(sysconfdir)/muttng-mime.types ]; then \

                $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \
        fi
 
                $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \
        fi
 

diff --git a/compose.c b/compose.c
index 5b163dc..a4d5ec9 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -301,9 +301,9 @@ static void draw_envelope (HEADER *msg, char *fcc)
   }
   else
   {
   }
   else
   {

-    mvprintw (HDR_TO, 0, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]);
+    mvprintw (HDR_TO, SidebarWidth, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]);

     mutt_paddstr (W, NONULL (msg->env->newsgroups));
     mutt_paddstr (W, NONULL (msg->env->newsgroups));

-    mvprintw (HDR_CC, 0, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]);
+    mvprintw (HDR_CC, SidebarWidth, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]);

     mutt_paddstr (W, NONULL (msg->env->followup_to));
     if (option (OPTXCOMMENTTO))
     {
     mutt_paddstr (W, NONULL (msg->env->followup_to));
     if (option (OPTXCOMMENTTO))
     {

diff --git a/makedoc.c b/makedoc.c
index ab1633f..cbbc427 100644 (file)
--- a/makedoc.c
+++ b/makedoc.c
@@ -226,18 +226,7 @@ static void makedoc (FILE *in, FILE *out)
   flush_doc (docstat, out);
   fputs ("\n", out);
   if (sort_error == 1)
   flush_doc (docstat, out);
   fputs ("\n", out);
   if (sort_error == 1)

-  {
-    fputs ("\n"
-           "***************************************************************************\n"
-           "*** There have been sorting errors for the manual's variable reference. ***\n"
-           "*** If you're not a developer playing with the code, please report this ***\n"
-           "*** error to <mutt-ng-devel@lists.berlios.de>                           ***\n"
-           "***                                                                     ***\n"
-           "*** I'm waiting 5 seconds for you to take notice.                       ***\n"
-           "***************************************************************************\n\n",
-           stderr);
-    sleep (5);
-  }
+    fputs ("makedoc: warning: there're sorting errors in vars\n", stderr);

 }
 
 /* skip whitespace */
 }
 
 /* skip whitespace */


@@ -427,11 +416,7 @@ static void handle_confline (char *s, FILE *out)
   else
   {
     if (lastvar[0] && strncmp (lastvar, varname, strlen (lastvar)) > 0)
   else
   {
     if (lastvar[0] && strncmp (lastvar, varname, strlen (lastvar)) > 0)

-    {
-      fprintf (stderr, "*** MAKEDOC WARNING: $%s must come before $%s ***\n",
-               varname, lastvar);

       sort_error = 1;
       sort_error = 1;

-    }

     remember (varname);
   }
   
     remember (varname);
   }