 @@ -1,14 +1,14 @@
-/*	$NetBSD: options.c,v 1.5 2008/12/12 22:55:55 lukem Exp $ */
+/*	$NetBSD: options.c,v 1.6 2009/08/07 16:19:53 lukem Exp $ */
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1991, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 @@ -74,28 +74,28 @@ OPTLIST const optlist[] = {
 	{L("columns"),	f_columns,	OPT_NUM,	OPT_NOSAVE},
 /* O_COMBINED */
 	{L("combined"),	NULL,		OPT_0BOOL,	OPT_NOSET|OPT_WC},
 /* O_COMMENT	  4.4BSD */
 	{L("comment"),	NULL,		OPT_0BOOL,	0},
 /* O_TMP_DIRECTORY	    4BSD */
 	{L("directory"),	NULL,		OPT_STR,	0},
 /* O_EDCOMPATIBLE   4BSD */
 	{L("edcompatible"),NULL,		OPT_0BOOL,	0},
 /* O_ERRORBELLS	    4BSD */
 	{L("errorbells"),	NULL,		OPT_0BOOL,	0},
 /* O_ESCAPETIME	  4.4BSD */
 	{L("escapetime"),	NULL,		OPT_NUM,	0},
-/* O_EXPANDTABS	  NetBSD 5.0 */
+/* O_EXPANDTAB	  NetBSD 5.0 */
-	{L("expandtabs"),	NULL,		OPT_0BOOL,	0},
+	{L("expandtab"),	NULL,		OPT_0BOOL,	0},
 /* O_EXRC	System V (undocumented) */
 	{L("exrc"),	NULL,		OPT_0BOOL,	0},
 /* O_EXTENDED	  4.4BSD */
 	{L("extended"),	f_recompile,	OPT_0BOOL,	0},
 /* O_FILEC	  4.4BSD */
 	{L("filec"),	NULL,		OPT_STR,	0},
 /* O_FILEENCODING */
 	{L("fileencoding"),f_encoding,	OPT_STR,	OPT_WC},
 /* O_FLASH	    HPUX */
 	{L("flash"),	NULL,		OPT_1BOOL,	0},
 #ifdef GTAGS
 /* O_GTAGSMODE	    FreeBSD/NetBSD */
 	{L("gtagsmode"),NULL,		OPT_1BOOL,	0},
 @@ -257,26 +257,27 @@ typedef struct abbrev {
         const CHAR_T *name;
         int offset;
 } OABBREV;
 static OABBREV const abbrev[] = {
 	{L("ai"),	O_AUTOINDENT},		/*     4BSD */
 	{L("ap"),	O_AUTOPRINT},		/*     4BSD */
 	{L("aw"),	O_AUTOWRITE},		/*     4BSD */
 	{L("bf"),	O_BEAUTIFY},		/*     4BSD */
 	{L("co"),	O_COLUMNS},		/*   4.4BSD */
 	{L("dir"),	O_TMP_DIRECTORY},	/*     4BSD */
 	{L("eb"),	O_ERRORBELLS},		/*     4BSD */
 	{L("ed"),	O_EDCOMPATIBLE},	/*     4BSD */
 	{L("et"),	O_EXPANDTAB},		/* NetBSD 5.0 */
 	{L("ex"),	O_EXRC},		/* System V (undocumented) */
 #ifdef GTAGS
 	{L("gt"),	O_GTAGSMODE},		/* FreeBSD, NetBSD */
 #endif
 	{L("fe"),	O_FILEENCODING},
 	{L("ht"),	O_HARDTABS},		/*     4BSD */
 	{L("ic"),	O_IGNORECASE},		/*     4BSD */
 	{L("ie"),	O_INPUTENCODING},
 	{L("li"),	O_LINES},		/*   4.4BSD */
 	{L("modelines"),	O_MODELINE},		/*     HPUX */
 	{L("nu"),	O_NUMBER},		/*     4BSD */
 	{L("opt"),	O_OPTIMIZE},		/*     4BSD */
 	{L("para"),	O_PARAGRAPHS},		/*     4BSD */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ex_shift.c,v 1.2 2008/12/12 22:55:56 lukem Exp $ */
+/*	$NetBSD: ex_shift.c,v 1.3 2009/08/07 16:19:54 lukem Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 @@ -125,27 +125,27 @@ shift(SCR *sp, EXCMD *cmdp, enum which r
 				continue;
+			}
+		}
 		/* Get a buffer that will hold the new line. */
 		ADD_SPACE_RETW(sp, bp, blen, newcol + len);
 		/*
 		 * Build a new indent string and count the number of
 		 * characters it uses.
 		 */
 		tbp = bp;
 		newidx = 0;
-		if (!O_ISSET(sp, O_EXPANDTABS)) {
+		if (!O_ISSET(sp, O_EXPANDTAB)) {
 			for (; newcol >= O_VAL(sp, O_TABSTOP); ++newidx) {
 				*tbp++ = '\t';
 				newcol -= O_VAL(sp, O_TABSTOP);
+			}
+		}
 		for (; newcol > 0; --newcol, ++newidx)
 			*tbp++ = ' ';
 		/* Add the original line. */
 		MEMCPYW(tbp, p + oldidx, len - oldidx);
 		/* Set the replacement line. */
 		if (db_set(sp, from, bp, (tbp + (len - oldidx)) - bp)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ex_txt.c,v 1.3 2008/12/12 22:55:56 lukem Exp $ */
+/*	$NetBSD: ex_txt.c,v 1.4 2009/08/07 16:19:54 lukem Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 @@ -397,27 +397,27 @@ txt_dent(SCR *sp, TEXT *tp)
 	/*
 	 * Since we don't know what comes before the character(s) being
 	 * deleted, we have to resolve the autoindent characters .  The
 	 * example is a <tab>, which doesn't take up a full shiftwidth
 	 * number of columns because it's preceded by <space>s.  This is
 	 * easy to get if the user sets shiftwidth to a value less than
 	 * tabstop, and then uses ^T to indent, and ^D to outdent.
+	 *
 	 * Count up spaces/tabs needed to get to the target.
 	 */
 	cno = 0;
 	tabs = 0;
-	if (!O_ISSET(sp, O_EXPANDTABS)) {
+	if (!O_ISSET(sp, O_EXPANDTAB)) {
 		for (; cno + COL_OFF(cno, ts) <= scno; ++tabs)
 			cno += COL_OFF(cno, ts);
+	}
 	spaces = scno - cno;
 	/* Make sure there's enough room. */
 	BINC_RETW(sp, tp->lb, tp->lb_len, tabs + spaces + 1);
 	/* Adjust the final ai character count. */
 	tp->ai = tabs + spaces;
 	/* Enter the replacement characters. */
 	for (tp->len = 0; tabs > 0; --tabs)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: v_txt.c,v 1.5 2009/01/18 03:45:50 lukem Exp $ */
+/*	$NetBSD: v_txt.c,v 1.6 2009/08/07 16:19:54 lukem Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 @@ -1715,36 +1715,36 @@ txt_ai_resolve(SCR *sp, TEXT *tp, int *c
 	    spaces = tab_after_sp = 0; len-- && isblank(*p); ++p)
 		if (*p == '\t') {
 			if (spaces)
 				tab_after_sp = 1;
 			scno += COL_OFF(scno, ts);
 		} else {
 			++spaces;
 			++scno;
+		}
 	/*
 	 * If there are no spaces, or no tabs after spaces and less than
 	 * ts spaces, it's already minimal.
-	 * Keep analysing if expandtabs is set.
+	 * Keep analysing if expandtab is set.
 	 */
 	if ((!spaces || (!tab_after_sp && spaces < ts)) &&
-	    !O_ISSET(sp, O_EXPANDTABS))
+	    !O_ISSET(sp, O_EXPANDTAB))
 		return;
 	/* Count up spaces/tabs needed to get to the target. */
 	cno = 0;
 	tabs = 0;
-	if (!O_ISSET(sp, O_EXPANDTABS)) {
+	if (!O_ISSET(sp, O_EXPANDTAB)) {
 		for (; cno + COL_OFF(cno, ts) <= scno; ++tabs)
 			cno += COL_OFF(cno, ts);
+	}
 	spaces = scno - cno;
 	/*
 	 * Figure out how many characters we're dropping -- if we're not
 	 * dropping any, it's already minimal, we're done.
 	 */
 	old = p - tp->lb;
 	new = spaces + tabs;
 	if (old == new)
 		return;
 @@ -1952,27 +1952,27 @@ txt_dent(SCR *sp, TEXT *tp, int isindent
 	 * ^D to move to the beginning of a line.  An example of this is:
+	 *
 	 *	:set ai sw=4<cr>i<space>a<esc>i^T^D
+	 *
 	 * Otherwise, count up the total spaces/tabs needed to get from the
 	 * beginning of the line (or the last non-<blank> character) to the
 	 * target.
 	 */
 	if (current >= target)
 		spaces = tabs = 0;
 	else {
 		cno = current;
 		tabs = 0;
-		if (!O_ISSET(sp, O_EXPANDTABS)) {
+		if (!O_ISSET(sp, O_EXPANDTAB)) {
 			for (; cno + COL_OFF(cno, ts) <= target; ++tabs)
 				cno += COL_OFF(cno, ts);
+		}
 		spaces = target - cno;
+	}
 	tp->ai = tabs + spaces;
 	/*
 	 * Call txt_insch() to insert each character, so that we get the
 	 * correct effect when we add a <tab> to replace N <spaces>.
 	 */
 	for (ch = '\t'; tabs > 0; --tabs)