From 9e9955aecf65dfbf80bb32c70feec4acadff2a66 Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Wed, 28 Aug 2013 22:31:55 -0600
Subject:   * Tune for help formatting in pine.hlp   * Pico: Justification
 works without need to define a quote string, it     allows justification of
 blocks indented with spaces.

---
 pico/Makefile.in       |  1 +
 pico/basic.c           | 17 ++++++-----------
 pico/osdep/Makefile.in |  1 +
 pico/word.c            | 14 ++++++--------
 4 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'pico')

diff --git a/pico/Makefile.in b/pico/Makefile.in
index 6f83b92f..82ff2d64 100644
--- a/pico/Makefile.in
+++ b/pico/Makefile.in
@@ -197,6 +197,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pico/basic.c b/pico/basic.c
index 49b04bd6..189d396e 100644
--- a/pico/basic.c
+++ b/pico/basic.c
@@ -304,16 +304,14 @@ gotobop(int f, int n)
 	 * PLUS: if there's a quote string, a quoted-to-non-quoted
 	 *	 line transition.
 	 */
-	quoted = glo_quote_str ? quote_match(glo_quote_str, curwp->w_dotp, qstr, NLINE) : 0;
+	quoted = quote_match(glo_quote_str, curwp->w_dotp, qstr, NLINE);
 	qlen   = quoted ? ucs4_strlen(qstr) : 0;
 	while(lback(curwp->w_dotp) != curbp->b_linep
 	      && llength(lback(curwp->w_dotp)) > qlen
-	      && (glo_quote_str
-		  ? (quoted == quote_match(glo_quote_str,
+	      && quoted == quote_match(glo_quote_str,
 					   lback(curwp->w_dotp),
 					   qstr2, NLINE)
-		     && !ucs4_strcmp(qstr, qstr2))
-		  : 1)
+	      && !ucs4_strcmp(qstr, qstr2)
 	      && lgetc(curwp->w_dotp, qlen).c != TAB
 	      && lgetc(curwp->w_dotp, qlen).c != ' ')
 	  curwp->w_dotp = lback(curwp->w_dotp);
@@ -373,19 +371,16 @@ gotoeop(int f, int n)
 	 * PLUS: if there's a quote string, a quoted-to-non-quoted
 	 *	 line transition.
 	 */
-	quoted = glo_quote_str
-	  ? quote_match(glo_quote_str,
-			curwp->w_dotp, qstr, NLINE) : 0;
+	quoted = quote_match(glo_quote_str,
+			curwp->w_dotp, qstr, NLINE);
 	qlen   = quoted ? ucs4_strlen(qstr) : 0;
 	
 	while(curwp->w_dotp != curbp->b_linep
 	      && llength(lforw(curwp->w_dotp)) > qlen
-	      && (glo_quote_str
-		  ? (quoted == quote_match(glo_quote_str,
+	      && (quoted == quote_match(glo_quote_str,
 					   lforw(curwp->w_dotp),
 					   qstr2, NLINE)
 		     && !ucs4_strcmp(qstr, qstr2))
-		  : 1)
 	      && lgetc(lforw(curwp->w_dotp), qlen).c != TAB
 	      && lgetc(lforw(curwp->w_dotp), qlen).c != ' ')
 	  curwp->w_dotp = lforw(curwp->w_dotp);
diff --git a/pico/osdep/Makefile.in b/pico/osdep/Makefile.in
index 1a9dae1a..d9e6cedf 100644
--- a/pico/osdep/Makefile.in
+++ b/pico/osdep/Makefile.in
@@ -148,6 +148,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pico/word.c b/pico/word.c
index 1f176ab3..b0008df1 100644
--- a/pico/word.c
+++ b/pico/word.c
@@ -815,11 +815,10 @@ fillpara(int f, int n)
 	swap_mark_and_dot_if_mark_comes_first();
 
 	/* determine if we're justifying quoted text or not */
-	qstr = (glo_quote_str
-		&& quote_match(glo_quote_str, 
-			       curwp->w_doto > 0 ? curwp->w_dotp->l_fp : curwp->w_dotp,
-			       qstr2, NSTRING)
-		&& *qstr2) ? qstr2 : NULL;
+	qstr = quote_match(glo_quote_str, 
+			curwp->w_doto > 0 ? curwp->w_dotp->l_fp : curwp->w_dotp,
+			qstr2, NSTRING)
+		&& *qstr2 ? qstr2 : NULL;
 
 
 	/*
@@ -843,10 +842,9 @@ fillpara(int f, int n)
 	  return(FALSE);
 
 	/* determine if we're justifying quoted text or not */
-	qstr = (glo_quote_str
-		&& quote_match(glo_quote_str, 
+	qstr = quote_match(glo_quote_str, 
 			       curwp->w_dotp, qstr2, NSTRING)
-		&& *qstr2) ? qstr2 : NULL;
+		&& *qstr2 ? qstr2 : NULL;
 
 	setmark(0,0);			/* mark last line of para */
 
-- 
cgit v1.2.3-54-g00ecf