summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--VERSION2
-rw-r--r--alpine/osdep/mswin.rc8
-rwxr-xr-xconfigure20
-rw-r--r--doc/alpine.12
-rw-r--r--doc/pico.112
-rw-r--r--doc/tech-notes/index.html2
-rw-r--r--doc/tech-notes/tech-notes.txt2
-rw-r--r--mapi/pmapi.c2
-rw-r--r--mapi/pmapi.rc8
-rw-r--r--pico/attach.c3
-rw-r--r--pico/browse.c8
-rw-r--r--pico/display.c11
-rw-r--r--pico/file.c6
-rw-r--r--pico/osdep/mswin.rc4
-rw-r--r--pico/pico.h2
-rw-r--r--pico/search.c15
-rw-r--r--pith/pine.hlp13
-rw-r--r--po/Makefile.in2
18 files changed, 71 insertions, 51 deletions
diff --git a/VERSION b/VERSION
index f1d06450..0e5b3f69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.20.6
+2.20.7
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index d0ca0649..e7e12bcb 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,20,6,0
- PRODUCTVERSION 2,20,6,0
+ FILEVERSION 2,20,7,0
+ PRODUCTVERSION 2,20,7,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
#else
VALUE "FileDescription", "Alpine\0"
#endif
- VALUE "FileVersion", "2.20.6\0"
+ VALUE "FileVersion", "2.20.7\0"
VALUE "InternalName", "alpine\0"
VALUE "LegalCopyright", "Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
VALUE "OriginalFilename", "alpine.exe\0"
VALUE "ProductName", "alpine\0"
- VALUE "ProductVersion", "2.20.6\0"
+ VALUE "ProductVersion", "2.20.7\0"
END
END
BLOCK "VarFileInfo"
diff --git a/configure b/configure
index 85226522..de3ef49f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Rev:17 by chappa@washington.edu.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.20.6.
+# Generated by GNU Autoconf 2.69 for alpine 2.20.7.
#
# Report bugs to <chappa@washington.edu>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.20.6'
-PACKAGE_STRING='alpine 2.20.6'
+PACKAGE_VERSION='2.20.7'
+PACKAGE_STRING='alpine 2.20.7'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1466,7 +1466,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures alpine 2.20.6 to adapt to many kinds of systems.
+\`configure' configures alpine 2.20.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1536,7 +1536,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.20.6:";;
+ short | recursive ) echo "Configuration of alpine 2.20.7:";;
esac
cat <<\_ACEOF
@@ -1830,7 +1830,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.20.6
+alpine configure 2.20.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2436,7 +2436,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by alpine $as_me 2.20.6, which was
+It was created by alpine $as_me 2.20.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3305,7 +3305,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.20.6'
+ VERSION='2.20.7'
cat >>confdefs.h <<_ACEOF
@@ -21303,7 +21303,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by alpine $as_me 2.20.6, which was
+This file was extended by alpine $as_me 2.20.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21369,7 +21369,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-alpine config.status 2.20.6
+alpine config.status 2.20.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/doc/alpine.1 b/doc/alpine.1
index d7aba4b7..de09c608 100644
--- a/doc/alpine.1
+++ b/doc/alpine.1
@@ -1,4 +1,4 @@
-.TH alpine 1 "Version 2.20.6"
+.TH alpine 1 "Version 2.20.7"
.SH NAME
alpine \- an Alternatively Licensed Program for Internet News and Email
.SH SYNTAX
diff --git a/doc/pico.1 b/doc/pico.1
index fe127f80..63c8d66d 100644
--- a/doc/pico.1
+++ b/doc/pico.1
@@ -1,4 +1,4 @@
-.TH pico 1 "Version 5.07"
+.TH pico 1 "Version 5.08"
.SH Name
pico \- simple text editor in the style of the Alpine Composer
.SH Syntax
@@ -29,9 +29,11 @@ immediately below. Paragraphs are delimited by blank lines, or by lines
beginning with a space or tab. Unjustification can be done immediately
after justification using the control-U key combination.
.PP
-String searches are not sensitive to case. A search begins at the current
-cursor position and wraps around the end of the text. The most recent
-search string is offered as the default in subsequent searches.
+String searches are not sensitive to case, but one can be done
+by pressing the control-W followed by control-^. A search begins at
+the current cursor position and wraps around the end of the text.
+The most recent search string is offered as the default in subsequent
+searches.
.PP
Blocks of text can be moved, copied or deleted with creative use of the
command for mark (ctrl-^), delete (ctrl-k) and undelete (ctrl-u).
@@ -172,4 +174,4 @@ alpine(1)
Source distribution (part of the Alpine Message System):
.nf
-$Date: 2009-02-02 13:54:23 -0600 (Mon, 02 Feb 2009) $
+$Date: 2015-04-19 12:28:01 -0500 (Sun, 19 Apr 2015) $
diff --git a/doc/tech-notes/index.html b/doc/tech-notes/index.html
index 5b3e46f8..95fae07d 100644
--- a/doc/tech-notes/index.html
+++ b/doc/tech-notes/index.html
@@ -3,7 +3,7 @@
<BODY>
<H1>Alpine Technical Notes</H1>
-Version 2.20.6, April 2015
+Version 2.20.7, April 2015
<H2><A NAME="TOC">Table of Contents</A></H2><P>
diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index cfdb45c1..dd5b9c4c 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,7 +1,7 @@
Alpine Technical Notes
- Version 2.20.6, April 2015
+ Version 2.20.7, April 2015
Table of Contents
diff --git a/mapi/pmapi.c b/mapi/pmapi.c
index 16898a7c..fe398992 100644
--- a/mapi/pmapi.c
+++ b/mapi/pmapi.c
@@ -1952,7 +1952,7 @@ BOOL APIENTRY DllMain(
now = time((time_t *)0);
tm_now = localtime(&now);
- fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.20.6\r\n");
+ fprintf(ms_global->dfd, "pmapi32.dll for Alpine Version 2.20.7\r\n");
fprintf(ms_global->dfd, " Build date: %s\r\n", datestamp);
fprintf(ms_global->dfd,
" please report all bugs to chappa@gmx.com\r\n");
diff --git a/mapi/pmapi.rc b/mapi/pmapi.rc
index 54956421..5c0957ec 100644
--- a/mapi/pmapi.rc
+++ b/mapi/pmapi.rc
@@ -98,8 +98,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,20,6,0
- PRODUCTVERSION 2,20,6,0
+ FILEVERSION 2,20,7,0
+ PRODUCTVERSION 2,20,7,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -117,14 +117,14 @@ BEGIN
VALUE "Comments", "alpine info: http://patches.freeiz.com/alpine\0"
VALUE "CompanyName", "Patches for Alpine\0"
VALUE "FileDescription", "Simple MAPI DLL for Alpine for Windows\0"
- VALUE "FileVersion", "2.20.6\0"
+ VALUE "FileVersion", "2.20.7\0"
VALUE "InternalName", "pmapi32\0"
VALUE "LegalCopyright", "Copyright ? University of Washington 2006-2009, Eduardo Chappa 2013-2014\0"
VALUE "LegalTrademarks", "Apache License, Version 2.0\0"
VALUE "OriginalFilename", "pmapi32.dll\0"
VALUE "PrivateBuild", " \0"
VALUE "ProductName", "Simple MAPI for Alpine for Windows\0"
- VALUE "ProductVersion", "2.20.6\0"
+ VALUE "ProductVersion", "2.20.7\0"
VALUE "SpecialBuild", " \0"
END
END
diff --git a/pico/attach.c b/pico/attach.c
index ff29efa7..be4a9fbf 100644
--- a/pico/attach.c
+++ b/pico/attach.c
@@ -62,9 +62,10 @@ AskAttach(char *cmnt, size_t cmntlen, LMLIST **lm)
while(i){
if(i == 2){
- EXTRAKEYS menu_attach[4];
+ EXTRAKEYS menu_attach[10];
int n;
+ memset(&menu_attach, 0, 10*sizeof(EXTRAKEYS));
menu_attach[n = 0].name = "^T";
menu_attach[n].label = N_("To Files");
menu_attach[n].key = (CTRL|'T');
diff --git a/pico/browse.c b/pico/browse.c
index 87f1ecec..79940109 100644
--- a/pico/browse.c
+++ b/pico/browse.c
@@ -803,6 +803,14 @@ FileBrowse(char *dir, size_t dirlen, char *fn, size_t fnlen,
static EXTRAKEYS opts[] = {
{"^X", N_("Add Name"), CTRL|'X', KS_NONE},
{NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE},
+ {NULL, NULL, 0, KS_NONE}
};
status = mlreply_utf8(_("Command to execute: "),
diff --git a/pico/display.c b/pico/display.c
index 84edf18e..96e3adb8 100644
--- a/pico/display.c
+++ b/pico/display.c
@@ -1558,6 +1558,8 @@ writeachar(UCS ucs)
* answer already typed in. Carriage return accepts the
* default. answer returned in buf which also holds the initial
* default, nbuf is its length, def set means use default value.
+ * In order to be able to eliminate keys from a menu, EXTRAKEYS
+ * always has size 10.
*/
int
mlreplyd(UCS *prompt, UCS *buf, int nbuf, int flg, EXTRAKEYS *extras)
@@ -1619,6 +1621,7 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf, int flg, EXTRAKEYS *extras)
}
#endif
+ memset(&menu_mlreply, 0, 12*sizeof(KEYMENU));
menu_mlreply[0].name = "^G";
menu_mlreply[0].label = N_("Get Help");
KS_OSDATASET(&menu_mlreply[0], KS_SCREENHELP);
@@ -1627,9 +1630,7 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf, int flg, EXTRAKEYS *extras)
KS_OSDATASET(&menu_mlreply[i], KS_NONE);
rfkm[2*i][1] = 0;
if(extras){
- for(; extras[j].name && j != 2*(i-1); j++)
- ;
-
+ j = 2*(i-1);
if(extras[j].name){
rfkm[2*i][1] = extras[j].key;
menu_mlreply[i].name = extras[j].name;
@@ -1646,9 +1647,7 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf, int flg, EXTRAKEYS *extras)
menu_mlreply[i].name = NULL;
rfkm[2*(i-6)+1][1] = 0;
if(extras){
- for(; extras[j].name && j != (2*(i-6)) - 1; j++)
- ;
-
+ j = 2*(i-6) - 1;
if(extras[j].name){
rfkm[2*(i-6)+1][1] = extras[j].key;
menu_mlreply[i].name = extras[j].name;
diff --git a/pico/file.c b/pico/file.c
index 47c55968..405d2c6f 100644
--- a/pico/file.c
+++ b/pico/file.c
@@ -115,12 +115,13 @@ insfile(int f, int n)
char fname[NLINE], dir[NLINE];
int retval, bye = 0, msg = 0;
char prompt[64], *infile;
- EXTRAKEYS menu_ins[5];
+ EXTRAKEYS menu_ins[10];
EML eml;
if (curbp->b_mode&MDVIEW) /* don't allow this command if */
return(rdonly()); /* we are in read only mode */
+ memset(&menu_ins, 0, 10*sizeof(EXTRAKEYS));
fname[0] = dir[0] = '\0';
while(!bye){
/* set up keymenu stuff */
@@ -566,9 +567,10 @@ filewrite(int f, int n)
register int s;
char fname[NFILEN];
char shows[NLINE], origshows[NLINE], *bufp;
- EXTRAKEYS menu_write[3];
+ EXTRAKEYS menu_write[10];
EML eml;
+ memset(&menu_write, 0, 10*sizeof(EXTRAKEYS));
if(curbp->b_fname[0] != 0){
strncpy(fname, curbp->b_fname, sizeof(curbp->b_fname));
curbp->b_fname[sizeof(curbp->b_fname)-1] = '\0';
diff --git a/pico/osdep/mswin.rc b/pico/osdep/mswin.rc
index b3d233a4..62e76a50 100644
--- a/pico/osdep/mswin.rc
+++ b/pico/osdep/mswin.rc
@@ -208,12 +208,12 @@ BEGIN
VALUE "Comments", "see http://www.washington.edu/pine\0"
VALUE "CompanyName", "University of Washington\0"
VALUE "FileDescription", "Pico\0"
- VALUE "FileVersion", "5.07\0"
+ VALUE "FileVersion", "5.08\0"
VALUE "InternalName", "pico\0"
VALUE "LegalCopyright", "Copyright 2006-2009\0"
VALUE "OriginalFilename", "pico.exe\0"
VALUE "ProductName", " pico\0"
- VALUE "ProductVersion", "5.07\0"
+ VALUE "ProductVersion", "5.08\0"
END
END
BLOCK "VarFileInfo"
diff --git a/pico/pico.h b/pico/pico.h
index 0b7b2b14..0605f992 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -379,7 +379,7 @@ typedef struct KBSTREE {
*/
#ifdef maindef
PICO *Pmaster = NULL; /* composer specific stuff */
-char *version = "5.07"; /* PICO version number */
+char *version = "5.08"; /* PICO version number */
#else
extern PICO *Pmaster; /* composer specific stuff */
diff --git a/pico/search.c b/pico/search.c
index 69979702..1aae21cf 100644
--- a/pico/search.c
+++ b/pico/search.c
@@ -172,7 +172,17 @@ forwsearch(int f, int n)
defpat[0] = '\0';
/* defaults: usual menu, search forward, not case sensitive */
- flags = SR_ORIGMEN | SR_FORWARD | SR_NOEXACT;
+
+ flags = SR_ORIGMEN | SR_FORWARD;
+
+ /* exact search is sticky -- that is, once one is done, so will be
+ * the next ones. This is consistent with all all searches being
+ * case insensitive by default.
+ */
+ if((curwp->w_bufp->b_mode & MDEXACT) == 0)
+ flags |= SR_NOEXACT;
+ else
+ flags |= SR_EXACTSR;
/* ask the user for the text of a pattern */
while(1){
@@ -934,8 +944,9 @@ readnumpat(char *utf8prompt)
{
int i, n;
char numpat[NPMT];
- EXTRAKEYS menu_pat[2];
+ EXTRAKEYS menu_pat[10];
+ memset(&menu_pat, 0, 10*sizeof(EXTRAKEYS));
menu_pat[i = 0].name = "^T";
menu_pat[i].label = N_("No Line Number");
menu_pat[i].key = (CTRL|'T');
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 10f4473b..200be84f 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 75 2015-04-17 09:40:25
+Alpine Commit 76 2015-04-23 00:24:02
============= h_news =================
<HTML>
<HEAD>
@@ -196,13 +196,6 @@ Additions include:
<LI> HTML: Add support for decoding entities in hexadecimal notation.
Suggested by Tulip&aacute;nt Gergely.
- <LI> Pico: Add the ability to search for strings in the beginning or end
- of a line. In the search menu, pressing Ctrl-^ toggles the prompt
- to search for a string at the beginning of a line. Another press of
- Ctrl-^ toggles the prompt to search for a string at the end of a
- line, and pressing Ctrl-^ one more time searches for the string
- anywhere in the text.
-
<LI> If the charset of a message can not be determined, use the value set
in the <A HREF="h_config_unk_char_set"><!--#echo var="VAR_unknown-character-set"--></A> for its value.
@@ -218,6 +211,10 @@ Additions include:
<LI> Pico: Search command can do a case sensitive match. Use the Ctrl-^
subcommand of the search command to bring this choice into view.
+ <LI> Pico: Add the ability to search for strings in the beginning or end
+ of a line. Use the Ctrl-^ subcommand of the search command to bring
+ this choice into view.
+
<LI> For a multipart/alternative message, the Take Address command will
work on the part that is being read.
diff --git a/po/Makefile.in b/po/Makefile.in
index dec3b36b..1afc5521 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
# Origin: gettext-0.16
PACKAGE = alpine
-VERSION = 2.20.6
+VERSION = 2.20.7
PACKAGE_BUGREPORT = chappa@washington.edu
SHELL = /bin/sh
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-06-30 06:03:39 +0000