[src/trunk]: src/bin/sh Changed the long name for the -L option from lineno_f...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d068508187f9
branches:  trunk
changeset: 354453:d068508187f9
user:      kre <kre%NetBSD.org@localhost>
date:      Sat Jun 17 07:50:35 2017 +0000

description:
Changed the long name for the -L option from lineno_fn_relative
to local_lineno as the latter seemed to be marginally more popular,
and perhaps more importantly, is the same length as the peviously
existing quietprofile option, which means the man page indentation
for the list of options can return to (about) what it was before...
(That is, less indented, which means more data/line, which means less
lines of man page - a good thing!)

diffstat:

 bin/sh/option.list |   4 ++--
 bin/sh/sh.1        |  21 +++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r 572d6b3d552d -r d068508187f9 bin/sh/option.list
--- a/bin/sh/option.list        Sat Jun 17 07:45:13 2017 +0000
+++ b/bin/sh/option.list        Sat Jun 17 07:50:35 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: option.list,v 1.3 2017/06/07 05:08:32 kre Exp $ */
+/* $NetBSD: option.list,v 1.4 2017/06/17 07:50:35 kre Exp $ */
 
 /*
  * define the shell's settable options
@@ -63,7 +63,7 @@
 pflag  nopriv          p               # preserve privs if set[ug]id
 posix  posix                           # be closer to POSIX compat
 qflag  quietprofile    q               # disable -v/-x in startup files
-fnline1        lineno_fn_relative      L on    # number lines in funcs starting at 1
+fnline1        local_lineno    L on            # number lines in funcs starting at 1
 
 // editline/history related options ("vi" is standard, 'V' and others are not)
 // only one of vi/emacs can be set, hence the "set" definition, value
diff -r 572d6b3d552d -r d068508187f9 bin/sh/sh.1
--- a/bin/sh/sh.1       Sat Jun 17 07:45:13 2017 +0000
+++ b/bin/sh/sh.1       Sat Jun 17 07:50:35 2017 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: sh.1,v 1.151 2017/06/08 02:23:51 kre Exp $
+.\"    $NetBSD: sh.1,v 1.152 2017/06/17 07:50:35 kre Exp $
 .\" Copyright (c) 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"    @(#)sh.1        8.6 (Berkeley) 5/4/95
 .\"
-.Dd June 4, 2017
+.Dd June 17, 2017
 .Dt SH 1
 .ds flags abCEeFfhnuvxIimpqV
 .Os
@@ -216,7 +216,15 @@
 unless otherwise stated, with the
 .Ic set
 built-in (described later).
-.Bl -tag -width \-WXXlineno_fn_relativeXX -offset indent
+.\"
+.\" strlen("quietprofile") == strlen("local_lineno"): pick the latter
+.\" to give the indent as the _ in that case, and the fi ligature in
+.\" the former combine to make local_lineno slightly wider when printed
+.\" (in italics) in a variable width font.   Probably should test the actual
+.\" widths and use the wider, but I am not sure if mandoc is up to that...
+.\" (and I don't know how to get at the font that will be used easily anyway!)
+.Bl -tag -width \-WXXlocal_linenoXX -offset indent
+.\"
 .It Fl a Em allexport
 Export all variables assigned to.
 .It Fl b Em notify
@@ -294,7 +302,7 @@
 Force the shell to behave interactively.
 .It Fl I Em ignoreeof
 Ignore EOFs from input when interactive.
-.It Fl L Em lineno_fn_relative
+.It Fl L Em local_lineno
 When set, before a function is defined,
 causes the variable
 .Ev LINENO
@@ -2921,7 +2929,7 @@
 If the
 .Fl L
 flag (the
-.Ic lineno_fn_relative
+.Ic local_lineno
 option, see
 .Sx Argument List Processing )
 is set, when the function is defined, then the function
@@ -2947,7 +2955,8 @@
 then from that point in the function,
 .Ev LINENO
 will give the line number as if lines are counted in sequence
-with the lines that surround the function definition.
+with the lines that surround the function definition (and
+any other function definitions in which this is nested.)
 If
 .Ev LINENO
 is made local, and in that same command, given a value, as