Attachment 301976 Details for Bug 441691 – A patch which adds --old-bot options

A patch which adds --old-bot options

less-394-newline.patch (text/x-patch), 2.62 KB, created by Zdenek Prikryl on 2008-04-10 13:27:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zdenek Prikryl

Created: 2008-04-10 13:27:27 UTC

Size: 2.62 KB

patch

obsolete

>--- line.c	2008-04-10 14:01:54.000000000 +0200
>+++ /home/zdeny/dev/fedora/less/F-8/less-406/line.c	2007-06-17 18:56:04.000000000 +0200
>@@ -59,6 +59,7 @@ extern int bl_s_width, bl_e_width;
> extern int so_s_width, so_e_width;
> extern int sc_width, sc_height;
> extern int utf_mode;
>+extern int oldbot;
> extern POSITION start_attnpos;
> extern POSITION end_attnpos;
> 
>@@ -994,6 +995,8 @@ pflushmbc()
> pdone(endline)
> 	int endline;
> {
>+	int nl;
>+
> 	(void) pflushmbc();
> 
> 	if (pendc && (pendc != '\r' || !endline))
>@@ -1024,8 +1027,21 @@ pdone(endline)
> 	/*
> 	 * Add a newline if necessary,
> 	 * and append a '\0' to the end of the line.
>+	 * We output a newline if we're not at the right edge of the screen,
>+	 * or if the terminal doesn't auto wrap,
>+	 * or if this is really the end of the line AND the terminal ignores
>+	 * a newline at the right edge.
>+	 * (In the last case we don't want to output a newline if the terminal 
>+	 * doesn't ignore it since that would produce an extra blank line.
>+	 * But we do want to output a newline if the terminal ignores it in case
>+	 * the next line is blank.  In that case the single newline output for
>+	 * that blank line would be ignored!)
> 	 */
>-	if (column < sc_width || !auto_wrap || ignaw || ctldisp == OPT_ON)
>+	if (!oldbot)
>+		nl = (column < sc_width || !auto_wrap || (endline && ignaw) || ctldisp == OPT_ON);
>+	else
>+		nl = (column < sc_width || !auto_wrap || ignaw || ctldisp == OPT_ON);
>+	if (nl)
> 	{
> 		linebuf[curr] = '\n';
> 		attr[curr] = AT_NORMAL;
>--- opttbl.c	2005-12-03 21:20:32.000000000 +0100
>+++ /home/zdeny/dev/fedora/less/F-8/less-406/opttbl.c	2007-06-17 18:56:04.000000000 +0200
>@@ -49,6 +50,7 @@ public int shift_count;		/* Number of po
> public int status_col;		/* Display a status column */
> public int use_lessopen;	/* Use the LESSOPEN filter */
> public int quit_on_intr;	/* Quit on interrupt */
>+public int oldbot;		/* Old bottom of screen behavior */
> #if HILITE_SEARCH
> public int hilite_search;	/* Highlight matched search patterns? */
> #endif
>@@ -110,6 +112,7 @@ static struct optname tilde_optname  = {
> static struct optname query_optname  = { "help",                 NULL };
> static struct optname pound_optname  = { "shift",                NULL };
> static struct optname keypad_optname = { "no-keypad",            NULL };
>+static struct optname oldbot_optname = { "old-bot",              NULL };
> 
> 
> /*
>@@ -429,6 +432,14 @@ static struct loption option[] =
> 			NULL
> 		}
> 	},
>+	{ '.', &oldbot_optname,
>+		BOOL, OPT_OFF, &oldbot, NULL,
>+		{
>+			"Use new bottom of screen behavior",
>+			"Use old bottom of screen behavior",
>+			NULL
>+		}
>+	},
> 	{ '\0', NULL, NOVAR, 0, NULL, NULL, { NULL, NULL, NULL } }
> };
>

Actions: View

Attachments on bug 441691: 301976