Commit a666499b authored by Thomas Roessler's avatar Thomas Roessler

- Makefile.am: Fix the dist target to include all necessary files.

- po/fr.po: New French translation.  (-> stable!)
- Add the new options to Muttrc.in.
- regex.c, configure.in: include config.h from regex.c, and handle
  alloca in a more intelligent way than before. (Currently, we just
  mis-handle it.)
  Port this to stable and test it!
- po/cs.po: update cs.po.
- po/de.po, po/nl.po: updated versions from Roland and Boris.
- pager.c: Vikas' grok_ansi fix.
- po/Makefile.in.in: keymap_defs is always in po/..  - from Lars
  Hecking.
parent 3439bcc1
......@@ -29,7 +29,7 @@ non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
gnupgparse.c resize.c dotlock.c pop.c imap.c socket.c
remailer.c remailer.h
remailer.c remailer.h browser.h
EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO configure acconfig.h attach.h \
buffy.h charset.h config.h copy.h dotlock.h functions.h gen_defs \
......@@ -38,7 +38,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO configure acconfig.h attach.h \
mutt_regex.h mutt_socket.h mx.h pager.h parse.h pgp.h protos.h \
reldate.h rfc1524.h rfc2047.h rfc822.h sha.h sha_locl.h \
sort.h mime.types VERSION prepare _regex.h OPS.MIX \
README.SECURITY
README.SECURITY remailer.c remailer.h browser.h Muttrc.in
BUILT_SOURCES = mutt_dotlock.c keymap_defs.h
......
......@@ -84,15 +84,17 @@ macro pager <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
# unset hidden_host
# set history=10
# set hostname=""
# unset ignore_list_rely_to
# set implicit_autoview=no
# set in_reply_to="%i; from %n on %{!%a, %b %d, %Y at %I:%M:%S%p %Z}"
# set include=ask-yes
# set indent_string="> "
# set index_format="%4C %Z %{%b %d} %-15.15L (%4l) %s"
# unset ignore_list_rely_to
# set ispell="@ISPELL@"
# set locale="C"
# set mail_check=5
# set mailcap_path=""
# set mailcap_sanitize # Change only if you know what you are doing!
# set mark_old
# set markers
# set mask="!^\\.[^.]"
......@@ -165,7 +167,6 @@ macro pager <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
# unset use_8bitmime
# set use_domain
# set use_from
# set use_mailcap
# set visual=""
# set wait_key
# set wrap_search
......
......@@ -17,9 +17,6 @@
/* Does your version of PGP support the PGPPASSFD environment variable? */
#define HAVE_PGPPASSFD
/* Disable the X-Mailer header? */
#undef NO_XMAILER
/* What is your domain name? */
#undef DOMAIN
......
......@@ -448,6 +448,8 @@ if test "$ac_cv_prog_CC" = gcc -a $mutt_cv_warnings = yes; then
CFLAGS="-Wall -pedantic $CFLAGS"
fi
CFLAGS="-DHAVE_CONFIG_H=1 $CFLAGS"
AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ],
[if test x$enableval = xyes; then
AC_DEFINE(NFS_ATTRIBUTE_HACK)
......
......@@ -288,6 +288,7 @@ struct option_t MuttVars[] = {
{ "wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, 1 },
{ "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 },
{ "write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1},
{ "x_mailer", DT_BOOL, R_NONE, OPTXMAILER, 1},
{ NULL }
};
......
......@@ -347,6 +347,7 @@ enum
OPTWRAP,
OPTWRAPSEARCH,
OPTWRITEBCC, /* write out a bcc header? */
OPTXMAILER,
/* PGP options */
......
......@@ -887,6 +887,13 @@ fill_buffer (FILE *f, long *last_pos, long offset, unsigned char *buf,
return b_read;
}
static int is_ansi (unsigned char *buf)
{
while (buf && (isdigit(*buf) || *buf == ';'))
buf++;
return (*buf == 'm');
}
static int grok_ansi(unsigned char *buf, int pos, ansi_attr *a)
{
int x = pos;
......@@ -1121,7 +1128,7 @@ display_line (FILE *f, long *last_pos, struct line_t **lineInfo, int n,
c = buf[cnt];
}
if (*buf_ptr == '\033' && *(buf_ptr + 1) && *(buf_ptr + 1) == '[')
if (*buf_ptr == '\033' && *(buf_ptr + 1) && *(buf_ptr + 1) == '[' && is_ansi (buf_ptr+2))
{
cnt = grok_ansi(buf, cnt+3, NULL);
cnt++;
......@@ -1252,7 +1259,7 @@ display_line (FILE *f, long *last_pos, struct line_t **lineInfo, int n,
}
/* Handle ANSI sequences */
if (c == '\033' && buf[ch+1] == '[')
if (c == '\033' && buf[ch+1] == '[' && is_ansi (buf+ch+2))
{
ch = grok_ansi(buf, ch+2, &a);
c = buf[ch];
......
......@@ -84,8 +84,8 @@ all: all-@USE_NLS@
all-yes: cat-id-tbl.c $(CATALOGS)
all-no:
$(top_srcdir)/keymap_defs.h:
cd $(top_srcdir) && $(MAKE) keymap_defs.h
../keymap_defs.h:
cd .. && $(MAKE) keymap_defs.h
$(srcdir)/$(PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/* Extended regular expression matching and search library,
version 0.12.
(Implements POSIX draft P1003.2/D11.2, except for some of the
internationalization features.)
Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
* version 0.12.
* (Implements POSIX draft P1003.2/D11.2, except for some of the
* internationalization features.)
*
* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
*
* This file is part of the GNU C Library. Its master source is NOT part of
* the C library, however. The master source lives in /gd/gnu/lib.
*
* The GNU C Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* The GNU C Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the GNU C Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modifications:
*
* Use _regex.h instead of regex.h. tlr, 1999-01-06
*
* Make REGEX_MALLOC depend on HAVE_ALLOCA &c.
* tlr, 1999-02-14
*/
/* The following doesn't mix too well with autoconfiguring
* the use of alloca. So let's disable it for AIX.
*/
#if 0
/* AIX requires this to be the first thing in the file. */
#if defined (_AIX) && !defined (REGEX_MALLOC)
#pragma alloca
#endif
#endif
#undef _GNU_SOURCE
#define _GNU_SOURCE
......@@ -42,6 +52,14 @@
#include <config.h>
#endif
#if (defined(HAVE_ALLOCA_H) && !defined(_AIX))
# include <alloca.h>
#endif
#if (!defined(HAVE_ALLOCA) || defined(_AIX))
# define REGEX_MALLOC
#endif
#if defined(STDC_HEADERS) && !defined(emacs)
#include <stddef.h>
#else
......
......@@ -1206,6 +1206,8 @@ main_loop:
if (pgp_get_keys (msg, &pgpkeylist) == -1)
goto main_loop;
mutt_message _("Invoking PGP...");
/* save the decrypted attachments */
save_content = msg->content;
......
......@@ -1336,13 +1336,11 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
mutt_write_mime_header (attach, fp);
}
#ifndef NO_XMAILER
if (mode == 0 && !privacy)
if (mode == 0 && !privacy && option (OPTXMAILER))
{
/* Add a vanity header */
fprintf (fp, "X-Mailer: Mutt %s\n", MUTT_VERSION);
}
#endif
/* Add any user defined headers */
for (; tmp; tmp = tmp->next)
......
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