summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--VERSION2
-rw-r--r--autom4te.cache/output.020
-rw-r--r--autom4te.cache/output.120
-rwxr-xr-xconfigure20
-rw-r--r--pico/browse.c8
-rw-r--r--pico/efunc.h8
-rw-r--r--pico/osdep/spell.c6
-rw-r--r--pico/search.c151
-rw-r--r--pith/pine.hlp8
-rw-r--r--po/Makefile.in2
10 files changed, 89 insertions, 156 deletions
diff --git a/VERSION b/VERSION
index 7e2524d2..6a5fe6e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.10.99999
+2.11
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index b3b62386..3f974b39 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,7 +1,7 @@
@%:@! /bin/sh
@%:@ From configure.ac Rev:2 by chappa@washington.edu.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.10.99999.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.
@%:@
@%:@ Report bugs to <chappa@washington.edu>.
@%:@
@@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.10.99999'
-PACKAGE_STRING='alpine 2.10.99999'
+PACKAGE_VERSION='2.11'
+PACKAGE_STRING='alpine 2.11'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1593,7 +1593,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.10.99999 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1663,7 +1663,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.10.99999:";;
+ short | recursive ) echo "Configuration of alpine 2.11:";;
esac
cat <<\_ACEOF
@@ -1947,7 +1947,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.10.99999
+alpine configure 2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2553,7 +2553,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.10.99999, which was
+It was created by alpine $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3374,7 +3374,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.10.99999'
+ VERSION='2.11'
cat >>confdefs.h <<_ACEOF
@@ -19972,7 +19972,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.10.99999, which was
+This file was extended by alpine $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20038,7 +20038,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.10.99999
+alpine config.status 2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index b3b62386..3f974b39 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,7 +1,7 @@
@%:@! /bin/sh
@%:@ From configure.ac Rev:2 by chappa@washington.edu.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.10.99999.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.
@%:@
@%:@ Report bugs to <chappa@washington.edu>.
@%:@
@@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.10.99999'
-PACKAGE_STRING='alpine 2.10.99999'
+PACKAGE_VERSION='2.11'
+PACKAGE_STRING='alpine 2.11'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1593,7 +1593,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.10.99999 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1663,7 +1663,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.10.99999:";;
+ short | recursive ) echo "Configuration of alpine 2.11:";;
esac
cat <<\_ACEOF
@@ -1947,7 +1947,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.10.99999
+alpine configure 2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2553,7 +2553,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.10.99999, which was
+It was created by alpine $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3374,7 +3374,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.10.99999'
+ VERSION='2.11'
cat >>confdefs.h <<_ACEOF
@@ -19972,7 +19972,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.10.99999, which was
+This file was extended by alpine $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20038,7 +20038,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.10.99999
+alpine config.status 2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure b/configure
index 129bf4b8..8c9f46e6 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Rev:2 by chappa@washington.edu.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.10.99999.
+# Generated by GNU Autoconf 2.69 for alpine 2.11.
#
# Report bugs to <chappa@washington.edu>.
#
@@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.10.99999'
-PACKAGE_STRING='alpine 2.10.99999'
+PACKAGE_VERSION='2.11'
+PACKAGE_STRING='alpine 2.11'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1593,7 +1593,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.10.99999 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1663,7 +1663,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.10.99999:";;
+ short | recursive ) echo "Configuration of alpine 2.11:";;
esac
cat <<\_ACEOF
@@ -1947,7 +1947,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.10.99999
+alpine configure 2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2553,7 +2553,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.10.99999, which was
+It was created by alpine $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3374,7 +3374,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.10.99999'
+ VERSION='2.11'
cat >>confdefs.h <<_ACEOF
@@ -19972,7 +19972,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.10.99999, which was
+This file was extended by alpine $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20038,7 +20038,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.10.99999
+alpine config.status 2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/pico/browse.c b/pico/browse.c
index 93de8066..46e01fd0 100644
--- a/pico/browse.c
+++ b/pico/browse.c
@@ -4,8 +4,8 @@ static char rcsid[] = "$Id: browse.c 942 2008-03-04 18:21:33Z hubert@u.washingto
/*
* ========================================================================
- * Copyright 2013 Eduardo Chappa
* Copyright 2006-2008 University of Washington
+ * Copyright 2013 Eduardo Chappa
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1595,9 +1595,8 @@ FileBrowse(char *dir, size_t dirlen, char *fn, size_t fnlen,
i = 0;
while(!i){
- int bsearch = 0;
- switch(readpattern(_("File name to find"), FALSE, bsearch)){
+ switch(readpattern(_("File name to find"), FALSE)){
case HELPCH:
emlwrite(_("\007No help yet!"), NULL);
/* remove break and sleep after help text is installed */
@@ -1606,9 +1605,6 @@ FileBrowse(char *dir, size_t dirlen, char *fn, size_t fnlen,
case (CTRL|'L'):
PaintBrowser(gmp, 0, &crow, &ccol);
break;
- case (CTRL|'P'):
- bsearch = bsearch == 0 ? 1 : 0;
- break;
case (CTRL|'Y'): /* first first cell */
for(tp = gmp->top; tp->prev; tp = tp->prev)
;
diff --git a/pico/efunc.h b/pico/efunc.h
index 16522f80..b551dfc7 100644
--- a/pico/efunc.h
+++ b/pico/efunc.h
@@ -2,8 +2,8 @@
* $Id: efunc.h 807 2007-11-09 01:21:33Z hubert@u.washington.edu $
*
* ========================================================================
- * Copyright 2013 Eduardo Chappa
* Copyright 2006-2007 University of Washington
+ * Copyright 2013 Eduardo Chappa
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -229,9 +229,9 @@ extern void unmarkbuffer(void);
/* search.c */
extern int forwsearch(int, int);
-extern int readpattern(char *, int, int);
-extern int forscan(int *, UCS *, int, LINE *, int, int);
-extern void chword(UCS *, UCS *, int);
+extern int readpattern(char *, int);
+extern int forscan(int *, UCS *, LINE *, int, int);
+extern void chword(UCS *, UCS *);
/* spell.c */
#ifdef SPELLER
diff --git a/pico/osdep/spell.c b/pico/osdep/spell.c
index 2b22beb2..87b345eb 100644
--- a/pico/osdep/spell.c
+++ b/pico/osdep/spell.c
@@ -4,8 +4,8 @@ static char rcsid[] = "$Id: spell.c 854 2007-12-07 17:44:43Z hubert@u.washington
/*
* ========================================================================
- * Copyright 2013 Eduardo Chappa
* Copyright 2006-2007 University of Washington
+ * Copyright 2013 Eduardo Chappa
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -207,7 +207,7 @@ spell(int f, int n)
switch(status){
case TRUE:
- chword(wb, cb, 0); /* correct word */
+ chword(wb, cb); /* correct word */
case FALSE:
update(); /* place cursor */
break;
@@ -285,7 +285,7 @@ movetoword(UCS *w)
olddotp = curwp->w_dotp;
curwp->w_bufp->b_mode |= MDEXACT; /* case sensitive */
- while(forscan(&i, w, 0, NULL, 0, 1) == TRUE){
+ while(forscan(&i, w, NULL, 0, 1) == TRUE){
if(i)
break; /* wrap NOT allowed! */
diff --git a/pico/search.c b/pico/search.c
index 62b529a3..0886b24c 100644
--- a/pico/search.c
+++ b/pico/search.c
@@ -4,8 +4,8 @@ static char rcsid[] = "$Id: search.c 1266 2009-07-14 18:39:12Z hubert@u.washingt
/*
* ========================================================================
- * Copyright 2013 Eduardo Chappa
* Copyright 2006-2008 University of Washington
+ * Copyright 2013 Eduardo Chappa
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@ int eq(UCS, UCS);
int expandp(UCS *, UCS *, int);
int readnumpat(char *);
void get_pat_cases(UCS *, UCS *);
-int srpat(char *, UCS *, size_t, int, int);
-int readpattern(char *, int, int);
-int replace_pat(UCS *, int *, int);
-int replace_all(UCS *, UCS *, int);
+int srpat(char *, UCS *, size_t, int);
+int readpattern(char *, int);
+int replace_pat(UCS *, int *);
+int replace_all(UCS *, UCS *);
#define FWS_RETURN(RV) { \
@@ -109,7 +109,7 @@ eq(UCS bc, UCS pc)
int
forwsearch(int f, int n)
{
- int status, bsearch;
+ int status;
int wrapt = FALSE, wrapt2 = FALSE;
int repl_mode = FALSE;
UCS defpat[NPAT];
@@ -124,15 +124,14 @@ forwsearch(int f, int n)
FWS_RETURN(0);
defpat[0] = '\0';
- bsearch = 0; /* search forward by default */
/* ask the user for the text of a pattern */
while(1){
if (gmode & MDREPLACE)
- status = srpat("Search", defpat, NPAT, repl_mode, bsearch);
+ status = srpat("Search", defpat, NPAT, repl_mode);
else
- status = readpattern("Search", TRUE, bsearch);
+ status = readpattern("Search", TRUE);
switch(status){
case TRUE: /* user typed something */
@@ -159,10 +158,6 @@ forwsearch(int f, int n)
update();
break;
- case (CTRL|'P'):
- bsearch = bsearch == 0 ? 1 : 0;
- break;
-
case (CTRL|'V'):
gotoeob(0, 1);
mlerase();
@@ -273,21 +268,21 @@ forwsearch(int f, int n)
*/
status = 0; /* using "status" as int temporarily! */
while(1){
- if(defpat[status] == '\0'){
- forwchar(0, 1 - 2*bsearch); /* move back if searching backward */
- break;
- }
+ if(defpat[status] == '\0'){
+ forwchar(0, 1);
+ break; /* find next occurence! */
+ }
- if(curwp->w_doto + status >= llength(curwp->w_dotp) ||
+ if(status + curwp->w_doto >= llength(curwp->w_dotp) ||
!eq(defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c))
- break;
- status++;
+ break; /* do nothing! */
+ status++;
}
/* search for the pattern */
while (n-- > 0) {
- if((status = forscan(&wrapt,defpat, bsearch, NULL,0,PTBEG)) == FALSE)
+ if((status = forscan(&wrapt,defpat,NULL,0,PTBEG)) == FALSE)
break;
}
@@ -306,7 +301,7 @@ forwsearch(int f, int n)
fs_give((void **) &utf8);
}
else if((gmode & MDREPLACE) && repl_mode == TRUE){
- status = replace_pat(defpat, &wrapt2, bsearch); /* replace pattern */
+ status = replace_pat(defpat, &wrapt2); /* replace pattern */
if (wrapt == TRUE || wrapt2 == TRUE){
eml.s = (status == ABORT) ? "cancelled but wrapped" : "Wrapped";
emlwrite("Replacement %s", &eml);
@@ -325,7 +320,7 @@ forwsearch(int f, int n)
/* Replace a pattern with the pattern the user types in one or more times. */
int
-replace_pat(UCS *defpat, int *wrapt, int bsearch)
+replace_pat(UCS *defpat, int *wrapt)
{
register int status;
UCS lpat[NPAT], origpat[NPAT]; /* case sensitive pattern */
@@ -336,7 +331,7 @@ replace_pat(UCS *defpat, int *wrapt, int bsearch)
UCS prompt[NPMT];
UCS *promptp;
- forscan(wrapt, defpat, bsearch, NULL, 0, PTBEG); /* go to word to be replaced */
+ forscan(wrapt, defpat, NULL, 0, PTBEG); /* go to word to be replaced */
lpat[0] = '\0';
@@ -421,10 +416,10 @@ replace_pat(UCS *defpat, int *wrapt, int bsearch)
}
if (repl_all){
- status = replace_all(defpat, lpat, bsearch);
+ status = replace_all(defpat, lpat);
}
else{
- chword(defpat, lpat, bsearch); /* replace word */
+ chword(defpat, lpat); /* replace word */
update();
status = TRUE;
}
@@ -475,7 +470,7 @@ replace_pat(UCS *defpat, int *wrapt, int bsearch)
}
else{
mlerase();
- chword(defpat, origpat, bsearch);
+ chword(defpat, origpat);
}
update();
@@ -506,7 +501,7 @@ get_pat_cases(UCS *realpat, UCS *searchpat)
/* Ask the user about every occurence of orig pattern and replace it with a
repl pattern if the response is affirmative. */
int
-replace_all(UCS *orig, UCS *repl, int bsearch)
+replace_all(UCS *orig, UCS *repl)
{
register int status = 0;
UCS *b;
@@ -520,7 +515,7 @@ replace_all(UCS *orig, UCS *repl, int bsearch)
EML eml;
while (1)
- if (forscan(&wrapt, orig, bsearch, stop_line, stop_offset, PTBEG)){
+ if (forscan(&wrapt, orig, stop_line, stop_offset, PTBEG)){
curwp->w_flag |= WFMOVE; /* put cursor back */
update();
@@ -567,10 +562,10 @@ replace_all(UCS *orig, UCS *repl, int bsearch)
if (status == TRUE){
n++;
- chword(realpat, repl, bsearch); /* replace word */
+ chword(realpat, repl); /* replace word */
update();
}else{
- chword(realpat, realpat, bsearch); /* replace word by itself */
+ chword(realpat, realpat); /* replace word by itself */
update();
if(status == ABORT){ /* if cancelled return */
eml.s = comatose(n);
@@ -598,14 +593,14 @@ replace_all(UCS *orig, UCS *repl, int bsearch)
/* Read a replacement pattern. Modeled after readpattern(). */
int
-srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int bsearch)
+srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode)
{
register int s;
int i = 0;
UCS *b;
UCS prompt[NPMT];
UCS *promptp;
- EXTRAKEYS menu_pat[9];
+ EXTRAKEYS menu_pat[8];
menu_pat[i = 0].name = "^Y";
menu_pat[i].label = N_("FirstLine");
@@ -648,24 +643,13 @@ srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int bsearc
KS_OSDATASET(&menu_pat[i], KS_NONE);
}
- menu_pat[++i].name = "^P";
- menu_pat[i].label = bsearch ? N_("Forward") : N_("Backward") ;
- menu_pat[i].key = (CTRL|'P');
- KS_OSDATASET(&menu_pat[i], KS_NONE);
-
menu_pat[++i].name = NULL;
b = utf8_to_ucs4_cpystr(utf8prompt);
if(b){
ucs4_strncpy(prompt, b, NPMT);
prompt[NPMT-1] = '\0';
- if(bsearch){
- fs_give((void **) &b);
- b = utf8_to_ucs4_cpystr(N_(" backward"));
- if(b) ucs4_strncat(prompt, b, ucs4_strlen(b));
- prompt[NPMT-1] = '\0';
- }
- if(b) fs_give((void **) &b);
+ fs_give((void **) &b);
}
promptp = &prompt[ucs4_strlen(prompt)];
@@ -778,14 +762,14 @@ readnumpat(char *utf8prompt)
int
-readpattern(char *utf8prompt, int text_mode, int bsearch)
+readpattern(char *utf8prompt, int text_mode)
{
register int s;
int i;
UCS *b;
UCS tpat[NPAT+20];
UCS *tpatp;
- EXTRAKEYS menu_pat[8];
+ EXTRAKEYS menu_pat[7];
menu_pat[i = 0].name = "^Y";
menu_pat[i].label = N_("FirstLine");
@@ -819,24 +803,13 @@ readpattern(char *utf8prompt, int text_mode, int bsearch)
KS_OSDATASET(&menu_pat[i], KS_NONE);
}
- menu_pat[++i].name = "^P";
- menu_pat[i].label = bsearch ? N_("Forward") : N_("Backward") ;
- menu_pat[i].key = (CTRL|'P');
- KS_OSDATASET(&menu_pat[i], KS_NONE);
-
menu_pat[++i].name = NULL;
b = utf8_to_ucs4_cpystr(utf8prompt);
if(b){
ucs4_strncpy(tpat, b, NPAT+20);
tpat[NPAT+20-1] = '\0';
- if(bsearch){
- fs_give((void **) &b);
- b = utf8_to_ucs4_cpystr(N_(" backward"));
- if(b) ucs4_strncat(tpat, b, ucs4_strlen(b));
- tpat[NPAT+20-1] = '\0';
- }
- if(b) fs_give((void **) &b);
+ fs_give((void **) &b);
}
tpatp = &tpat[ucs4_strlen(tpat)];
@@ -885,7 +858,6 @@ readpattern(char *utf8prompt, int text_mode, int bsearch)
int
forscan(int *wrapt, /* boolean indicating search wrapped */
UCS *patrn, /* string to scan for */
- int bsearch, /* search backwards */
LINE *limitp, /* stop searching if reached */
int limito, /* stop searching if reached */
int leavep) /* place to leave point
@@ -913,23 +885,8 @@ forscan(int *wrapt, /* boolean indicating search wrapped */
*
* first, test to see if we are at the end of the line,
* otherwise start searching on the next character.
- * For a backward search, test if we are at the beginning
- * of a line, and move backward in this case.
*/
- if(bsearch){
- if(curwp->w_doto == 0){
- stopline = curline = lback(curwp->w_dotp);
- stopoff = curoff = llength(stopline);
- if (stopline == curbp->b_linep)
- *wrapt = TRUE;
- }
- else{
- stopoff = curoff = curwp->w_doto;
- stopline = curline = curwp->w_dotp;
- }
- }
- else {
- if(curwp->w_doto == llength(curwp->w_dotp)){
+ if(curwp->w_doto == llength(curwp->w_dotp)){
/*
* dot is not on end of a line
* start at 0 offset of the next line
@@ -938,11 +895,10 @@ forscan(int *wrapt, /* boolean indicating search wrapped */
stopline = curline = lforw(curwp->w_dotp);
if (curwp->w_dotp == curbp->b_linep)
*wrapt = TRUE;
- }
- else{
+ }
+ else{
stopoff = curoff = curwp->w_doto;
stopline = curline = curwp->w_dotp;
- }
}
/* scan each character until we hit the head link record */
@@ -952,8 +908,7 @@ forscan(int *wrapt, /* boolean indicating search wrapped */
*/
while (curline){
- if ((bsearch && lback(curline) == curbp->b_linep)
- || (!bsearch && curline == curbp->b_linep))
+ if (curline == curbp->b_linep)
*wrapt = TRUE;
/* save the current position in case we need to
@@ -962,39 +917,29 @@ forscan(int *wrapt, /* boolean indicating search wrapped */
lastline = curline;
lastoff = curoff;
- if(bsearch){
- if (curoff == -1) { /* if at BOL */
- curline = lback(curline); /* skip to next line */
- curoff = llength(curline) - 1;
- c = '\0';
- }
- else
- c = lgetc(curline, curoff--).c; /* get the char */
- } else {
- /* get the current character resolving EOLs */
- if (curoff == llength(curline)) { /* if at EOL */
+ /* get the current character resolving EOLs */
+ if (curoff == llength(curline)) { /* if at EOL */
curline = lforw(curline); /* skip to next line */
curoff = 0;
c = '\n'; /* and return a <NL> */
- }
- else
- c = lgetc(curline, curoff++).c; /* get the char */
}
+ else
+ c = lgetc(curline, curoff++).c; /* get the char */
/* test it against first char in pattern */
if (eq(c, patrn[0]) != FALSE) { /* if we find it..*/
/* setup match pointers */
matchline = curline;
- matchoff = bsearch ? curoff + 2 : curoff;
+ matchoff = curoff;
patptr = &patrn[0];
/* scan through patrn for a match */
while (*++patptr != '\0') {
/* advance all the pointers */
- if (matchoff >= llength(matchline)) {
+ if (matchoff == llength(matchline)) {
/* advance past EOL */
matchline = lforw(matchline);
- matchoff = 0;
+ matchoff = 0;
c = '\n';
} else
c = lgetc(matchline, matchoff++).c;
@@ -1082,15 +1027,11 @@ expandp(UCS *srcstr, /* string to expand */
* pointers to the word in cb
*/
void
-chword(UCS *wb, UCS *cb, int bsearch)
+chword(UCS *wb, UCS *cb)
{
- long l;
- ldelete(ucs4_strlen(wb), NULL); /* not saved in kill buffer */
- for(l = 0L; *cb != '\0'; l++)
+ ldelete((long) ucs4_strlen(wb), NULL); /* not saved in kill buffer */
+ while(*cb != '\0')
linsert(1, *cb++);
- if(bsearch)
- backchar(0, l);
-
curwp->w_flag |= WFEDIT;
}
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 31e42784..e3b5b627 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 22 2013-08-04 22:04:58
+Alpine Commit 23 2013-08-11 11:25:41
============= h_news =================
<HTML>
<HEAD>
@@ -185,9 +185,6 @@ Additions include:
with a quote string, followed by a space were considered individual paragraphs,
now they are considered part of a paragraph. Based on earlier joint work
with Jeff Franklin.
- <LI> Pico: The search command in Pico allows backwards search. In order
-to search backwards, start a search with the CTRL-W command, and press
-CTRL-P to change the direction of the search.
<LI> Unix Alpine: Allow local .pinerc file to be a symbolic link.
<LI> Experimental extended support of recognition of UTF-8 in urls based on
information from <A HREF="http://url.spec.whatwg.org">http://url.spec.whatwg.org</A>.
@@ -200,8 +197,7 @@ used in the display of the INDEX SCREEN.
<LI> New option <A HREF="h_config_preserve_field"><!--#echo var="FEAT_preserve-original-fields"--></A>
that adds the ability to preserve To: and Cc: fields when replying to a
message, as specified by original sender.
- <LI> Add a _SILENT_ token to the
-<A HREF="h_config_display_filters">list of tokens</A>
+ <LI> Add a _SILENT_ token to the <A HREF="h_config_display_filters">list of tokens</A>
for a display filter, so that Alpine will not redraw the screen when it is unnecessary.
<LI> Quota command includes subcommands for printing, forwarding, etc.
</UL>
diff --git a/po/Makefile.in b/po/Makefile.in
index 3977445c..8f336b68 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
# Origin: gettext-0.16
PACKAGE = alpine
-VERSION = 2.10.9999
+VERSION = 2.10.99999
PACKAGE_BUGREPORT = chappa@washington.edu
SHELL = /bin/sh
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-22 08:17:21 +0000