Index: src/rcfile.c
===================================================================
--- src/rcfile.c	(revision 5286)
+++ src/rcfile.c	(working copy)
@@ -63,6 +63,7 @@
 #endif
 #ifndef DISABLE_HISTORIES
     {"poslog", POS_HISTORY},
+    {"positionlog", POS_HISTORY},
 #endif
     {"preserve", PRESERVE},
 #ifndef DISABLE_JUSTIFY
Index: src/nano.c
===================================================================
--- src/nano.c	(revision 5286)
+++ src/nano.c	(working copy)
@@ -873,7 +873,7 @@
 #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"));
@@ -2157,6 +2157,7 @@
 	{"historylog", 0, NULL, 'H'},
 	{"noconvert", 0, NULL, 'N'},
 	{"poslog", 0, NULL, 'P'},
+	{"positionlog", 0, NULL, 'P'},
 	{"smooth", 0, NULL, 'S'},
 	{"quickblank", 0, NULL, 'U'},
 	{"wordbounds", 0, NULL, 'W'},
Index: doc/nanorc.sample.in
===================================================================
--- doc/nanorc.sample.in	(revision 5286)
+++ doc/nanorc.sample.in	(working copy)
@@ -104,7 +104,7 @@
 # set operatingdir ""
 
 ## Remember the cursor position in each file for the next editing session.
-# set poslog
+# set positionlog
 
 ## Preserve the XON and XOFF keys (^Q and ^S).
 # set preserve
Index: doc/syntax/nanorc.nanorc
===================================================================
--- doc/syntax/nanorc.nanorc	(revision 5286)
+++ doc/syntax/nanorc.nanorc	(working copy)
@@ -6,7 +6,7 @@
 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|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|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:]]*$"
Index: doc/man/nanorc.5
===================================================================
--- doc/man/nanorc.5	(revision 5286)
+++ doc/man/nanorc.5	(working copy)
@@ -158,7 +158,7 @@
 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
Index: doc/man/nano.1
===================================================================
--- doc/man/nano.1	(revision 5286)
+++ doc/man/nano.1	(working copy)
@@ -115,7 +115,7 @@
 .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
Index: doc/texinfo/nano.texi
===================================================================
--- doc/texinfo/nano.texi	(revision 5286)
+++ doc/texinfo/nano.texi	(working copy)
@@ -109,9 +109,9 @@
 @end quotation
 
 But normallly you would set your preferred options in your
address@hidden 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.
address@hidden 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 @@
 Use the blank line below the titlebar as extra editing space.
 
 @item -P
address@hidden --poslog
address@hidden --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 @@
 files are inserted from this directory.  By default, the operating
 directory feature is turned off.
 
address@hidden set poslog
address@hidden set positionlog
 Save the cursor position of files between editing sessions.
 
 @item set preserve