From c30879afd71ee24e706b6d8c7b7916f36407e937 Mon Sep 17 00:00:00 2001 From: nion Date: Wed, 23 Feb 2005 13:34:28 +0000 Subject: [PATCH 1/1] Nico Golde: included patch by Rocco Rutte to correct minor bugs git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@79 e385b8ad-14ed-0310-8656-cc95a2468c6d --- ChangeLog.mutt-ng | 1 + compose.c | 4 ++-- configure.in | 12 ++++++------ doc/Makefile.in | 4 ++-- handler.c | 3 ++- init.h | 2 +- lib.h | 1 + 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog.mutt-ng b/ChangeLog.mutt-ng index 2eceb6d..c07388e 100644 --- a/ChangeLog.mutt-ng +++ b/ChangeLog.mutt-ng @@ -2,6 +2,7 @@ Changes specific to mutt-ng: 2005-02-23: * Integrated assume_charset patch from http://www.emaillab.org/mutt/download15.html.en + * Integrated patch bei Rocco Rutte to correct minor bugs 2005-02-22: * Merged mutt changes diff --git a/compose.c b/compose.c index 90de047..5b163dc 100644 --- a/compose.c +++ b/compose.c @@ -190,11 +190,11 @@ static void redraw_crypt_lines (HEADER *msg) clrtoeol (); if ((WithCrypto & APPLICATION_PGP) && msg->security & APPLICATION_PGP && msg->security & SIGN) - printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("")); + printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("")); if ((WithCrypto & APPLICATION_SMIME) && msg->security & APPLICATION_SMIME && msg->security & SIGN) { - printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("")); + printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("")); } if ((WithCrypto & APPLICATION_SMIME) diff --git a/configure.in b/configure.in index 419ae45..1fda7bd 100644 --- a/configure.in +++ b/configure.in @@ -197,13 +197,13 @@ main () if test $withval = yes; then if test -d $srcdir/../slang; then mutt_cv_slang=$srcdir/../slang/src - CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" + CFLAGS="$CFLAGS -I${mutt_cv_slang}" LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" else if test -d $mutt_cv_prefix/include/slang; then - CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang" + CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang" elif test -d /usr/include/slang; then - CPPFLAGS="$CPPFLAGS -I/usr/include/slang" + CFLAGS="$CFLAGS -I/usr/include/slang" fi mutt_cv_slang=yes fi @@ -211,15 +211,15 @@ main () dnl ---Check to see if $withval is a source directory if test -f $withval/src/slang.h; then mutt_cv_slang=$withval/src - CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" + CFLAGS="$CFLAGS -I${mutt_cv_slang}" LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" else dnl ---Must be installed somewhere mutt_cv_slang=$withval if test -d $withval/include/slang; then - CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" + CFLAGS="$CFLAGS -I${withval}/include/slang" elif test -d $withval/include; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" + CFLAGS="$CFLAGS -I${withval}/include" fi LDFLAGS="$LDFLAGS -L${withval}/lib" fi diff --git a/doc/Makefile.in b/doc/Makefile.in index d3b54e7..fce11af 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -60,8 +60,8 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ - ChangeLog.old \ - README NEWS TODO README.SECURITY README.SSL + ChangeLog.old ChangeLog.mutt-ng \ + README NEWS TODO TODO.mutt-ng README.SECURITY README.SSL all: muttrc.man try-html try-txt diff --git a/handler.c b/handler.c index 251f479..d0900ae 100644 --- a/handler.c +++ b/handler.c @@ -35,6 +35,7 @@ #include "copy.h" #include "charset.h" #include "mutt_crypt.h" +#include "lib.h" #define BUFI_SIZE 1000 @@ -1231,7 +1232,7 @@ static void print_flowed_line(char * line, STATE *s,int ql) { pos=line+ql+width; oldpos=line+ql; - if (ql>0 && isblank(*oldpos)) ++oldpos; + if (ql>0 && ISBLANK(*oldpos)) ++oldpos; /* fprintf(stderr,"oldpos = %p line+len = %p\n",oldpos,line+len); */ diff --git a/init.h b/init.h index d3dd411..a569719 100644 --- a/init.h +++ b/init.h @@ -490,7 +490,7 @@ struct option_t MuttVars[] = { { "dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, UL BINDIR "/muttng_dotlock" }, /* ** .pp - ** Contains the path of the mutt_dotlock (8) binary to be used by + ** Contains the path of the muttng_dotlock (8) binary to be used by ** mutt. */ #endif diff --git a/lib.h b/lib.h index f5fb94e..b496e04 100644 --- a/lib.h +++ b/lib.h @@ -91,6 +91,7 @@ on some systems */ # define SKIPWS(c) while (*(c) && isspace ((unsigned char) *(c))) c++; +#define ISBLANK(c) (c == ' ' || c == '\t') /* * These functions aren't defined in lib.c, but * they are used there. -- 2.20.1