Unabbreviating the long option --poslog to --positionlog.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5300 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

ChangeLog

@@ -1,7 +1,8 @@
 2015-07-15  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.c, src/rcfile.c, doc/nanorc.sample.in, doc/man/nano.1,
 	doc/man/nanorc.5, doc/texinfo/nano.texi, doc/syntax/nanorc.nanorc:
-	Unabbreviate the long option --const to --constantshow.
+	Unabbreviate the long option --const to --constantshow, and --poslog
+	to --positionlog, to be more understandable.
 
 2015-07-13  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_int_spell_fix, do_alt_speller): Remove an unneeded

doc/man/nano.1

@@ -115,7 +115,7 @@ Disable automatic conversion of files from DOS/Mac format.
 .BR \-O ", " \-\-morespace
 Use the blank line below the titlebar as extra editing space.
 .TP
-.BR \-P ", " \-\-poslog
+.BR \-P ", " \-\-positionlog
 Log and later read back the location of the cursor and place it there
 again.
 .TP

doc/man/nanorc.5

@@ -158,7 +158,7 @@ subdirectories.  Also, the current directory is changed to here, so
 files are inserted from this directory.  By default, the operating
 directory feature is turned off.
 .TP
-.B set poslog
+.B set positionlog
 Save the cursor position of files between editing sessions.
 .TP
 .B set preserve

doc/nanorc.sample.in

@@ -45,8 +45,9 @@
 # set casesensitive
 
 ## Constantly display the cursor position in the statusbar.  Note that
-## this overrides "quickblank".  (The old form, 'const', is deprecated.)
+## this overrides "quickblank".
 # set constantshow
+## (The old form, 'const', is deprecated.)
 
 ## Use cut-to-end-of-line by default.
 # set cut
@@ -104,7 +105,8 @@
 # set operatingdir ""
 
 ## Remember the cursor position in each file for the next editing session.
-# set poslog
+# set positionlog
+## (The old form, 'poslog', is deprecated.)
 
 ## Preserve the XON and XOFF keys (^Q and ^S).
 # set preserve

doc/syntax/nanorc.nanorc

@@ -6,7 +6,7 @@ syntax "nanorc" "\.?nanorc$"
 icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|i?color|extendsyntax).*$"
 
 # Keywords
-icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backwards|boldtext|casesensitive|const(antshow)?|cut|fill|historylog|locking|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|poslog|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|view|wordbounds)\>"
+icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backwards|boldtext|casesensitive|const(antshow)?|cut|fill|historylog|locking|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|pos(ition)?log|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|view|wordbounds)\>"
 icolor yellow "^[[:space:]]*set[[:space:]]+(functioncolor|keycolor|statuscolor|titlecolor)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
 icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|functioncolor|keycolor|matchbrackets|operatingdir|punct|quotestr|speller|statuscolor|titlecolor|whitespace)[[:space:]]+"
 icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(2|with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)+[[:space:]]*$"

doc/texinfo/nano.texi

@@ -109,9 +109,9 @@ adding it with a comma.  So the complete command synopsis is:
 @end quotation
 
 But normallly you would set your preferred options in your
-@file{.nanorc} file.  And when the @code{poslog} option is set
+@file{.nanorc} file.  And when the @code{positionlog} option is set
-(making @code{nano} remember the cursor position), you will rarely
+(making @code{nano} remember the cursor position when you close a file),
-need to specify a line number.
+you will rarely need to specify a line number.
 
 @node Command-line Options
 @chapter Command-line Options
@@ -187,7 +187,7 @@ Disable automatic conversion of files from DOS/Mac format.
 Use the blank line below the titlebar as extra editing space.
 
 @item -P
-@itemx --poslog
+@itemx --positionlog
 Log for each file the last location of the cursor, and read it
 back upon reopening the file and place it there again.
 
@@ -710,7 +710,7 @@ subdirectories.  Also, the current directory is changed to here, so
 files are inserted from this directory.  By default, the operating
 directory feature is turned off.
 
-@item set poslog
+@item set positionlog
 Save the cursor position of files between editing sessions.
 
 @item set preserve

src/nano.c

@@ -874,7 +874,7 @@ void usage(void)
 #endif
     print_opt("-O", "--morespace", N_("Use one more line for editing"));
 #ifndef DISABLE_HISTORIES
-    print_opt("-P", "--poslog", N_("Log & read location of cursor position"));
+    print_opt("-P", "--positionlog", N_("Log & read location of cursor position"));
 #endif
 #ifndef DISABLE_JUSTIFY
     print_opt(_("-Q <str>"), _("--quotestr=<str>"), N_("Quoting string"));
@@ -2155,7 +2155,8 @@ int main(int argc, char **argv)
 	{"locking", 0, NULL, 'G'},
 	{"historylog", 0, NULL, 'H'},
 	{"noconvert", 0, NULL, 'N'},
-	{"poslog", 0, NULL, 'P'},
+	{"poslog", 0, NULL, 'P'},  /* deprecated form, remove in 2018 */
+	{"positionlog", 0, NULL, 'P'},
 	{"smooth", 0, NULL, 'S'},
 	{"quickblank", 0, NULL, 'U'},
 	{"wordbounds", 0, NULL, 'W'},

src/rcfile.c

@@ -63,7 +63,8 @@ static const rcoption rcopts[] = {
     {"operatingdir", 0},
 #endif
 #ifndef DISABLE_HISTORIES
-    {"poslog", POS_HISTORY},
+    {"poslog", POS_HISTORY},  /* deprecated form, remove in 2018 */
+    {"positionlog", POS_HISTORY},
 #endif
     {"preserve", PRESERVE},
 #ifndef DISABLE_JUSTIFY