diff --git a/ChangeLog b/ChangeLog
index 10a2550628027655e285ee7b9ca708eed5019441..b9e39c120a1ba0b92be9d1b9dca03ef6dd6b32de 100644
--- a/ChangeLog
+++ b/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
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 224a65bebbc5e6cf8832127e7b2c716cc1c416f4..c8d1d3a9fcce9830cedf111ada89e5781bf73f7f 100644
--- a/doc/man/nano.1
+++ b/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
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 95233661487f4c464d92076a5696ef4892eee776..60206b27383ab33d151025c470ca771efba7982d 100644
--- a/doc/man/nanorc.5
+++ b/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
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index afaa70d459dffd9abb8f8f80125213322f154d2f..e45681ed66ad45566c36158e34c8d96a74f478bf 100644
--- a/doc/nanorc.sample.in
+++ b/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
diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
index 02e3f404f331bdb5a27bc1653d4b5bc5004d269f..8846cf6f71addf527613413c0752ce38bd1d6ad2 100644
--- a/doc/syntax/nanorc.nanorc
+++ b/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:]]*$"
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index bbe90b618bfe97ed0ecdc52237ce3a3d341cbdcf..b77cab3d3e12b9b75dfec4c1d01502e53ff3c036 100644
--- a/doc/texinfo/nano.texi
+++ b/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
-(making @code{nano} remember the cursor position), you will rarely
-need to specify a line number.
+@file{.nanorc} file. And when the @code{positionlog} option is set
+(making @code{nano} remember the cursor position when you close a file),
+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
diff --git a/src/nano.c b/src/nano.c
index 727962fc846e04f8930db3b3d7cc5c26db3fd09a..967a792cf0518880faf3547a779da4391f261e31 100644
--- a/src/nano.c
+++ b/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'},
diff --git a/src/rcfile.c b/src/rcfile.c
index babbfad2cba5bf6f8941b864cb2ce6986449573b..0d2aea4c59509959405912c9c7cbd26c267460d3 100644
--- a/src/rcfile.c
+++ b/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