From 3c71a13e95a51d1988f15c01a804cfb9962aa8fe Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Wed, 7 Sep 2022 21:55:05 +0100
Subject: [PATCH] Clean up .nanorc-*, add new options.

---
 .nanorc-4.8                | 114 -----------------------------------
 .nanorc-5.2                | 118 -------------------------------------
 .nanorc-5.5 => .nanorc-6.0 |  15 ++++-
 3 files changed, 12 insertions(+), 235 deletions(-)
 delete mode 100644 .nanorc-4.8
 delete mode 100644 .nanorc-5.2
 rename .nanorc-5.5 => .nanorc-6.0 (93%)

diff --git a/.nanorc-4.8 b/.nanorc-4.8
deleted file mode 100644
index 1efe8bc..0000000
--- a/.nanorc-4.8
+++ /dev/null
@@ -1,114 +0,0 @@
-## Sample initialization file for GNU nano.
-##
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read!  Also note that this file should not be in
-## DOS or Mac format, and that characters specially interpreted by the
-## shell should not be escaped here.
-##
-## To make sure an option is disabled, use "unset <option>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## Quotes inside string parameters don't have to be escaped with
-## backslashes.  The last double quote in the string will be treated as
-## its end.  For example, for the "brackets" option, ""')>]}" will match
-## ", ', ), >, ], and }.
-
-## When soft line wrapping is enabled, make it wrap lines at blank characters.
-set atblanks
-
-## Use auto-indentation.
-# set autoindent
-
-## Automatically hard-wrap the current line when it becomes overlong.
-# set breaklonglines
-
-## Do case-sensitive searches by default.
-# set casesensitive
-
-## Do not use the line below the title bar.
-# set emptyline
-
-## Set the line length for wrapping text and justifying paragraphs.
-set fill -2
-
-## Draw a vertical stripe at the given column
-# set guidestripe 140
-
-## Remember the used search/replace strings for the next session.
-set historylog
-
-## Scroll the buffer contents per half-screen instead of per line.
-# set jumpyscrolling
-
-## Display line numbers to the left of the text area.
-set linenumbers
-
-## Enable vim-style lock-files.
-set locking
-
-## Don't display the helpful shortcut lists at the bottom of the screen.
-set nohelp
-
-## Don't add newlines to the ends of files.
-# set nonewlines
-
-## Do quick statusbar blanking.
-set quickblank
-
-## Do extended regular expression searches by default.
-# set regexp
-
-## Make the Home key smarter.
-set smarthome
-
-## Enable soft line wrapping (AKA full-line display).
-# set softwrap
-
-## Use this spelling checker instead of the internal one.
-set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-set suspendable
-
-## When justifying text, trailing whitespace will automatically be removed.
-set trimblanks
-
-## The two characters used to indicate the presence of tabs and spaces.
-set whitespace »·
-
-## Detect word boundaries more accurately by treating punctuation
-## characters as parts of words.
-# set wordbounds
-
-## Let an unmodified Backspace or Delete erase the marked region, without affecting the cut-buffer.
-# set zap
-
-
-## Paint the interface elements of nano.
-## This is an example; by default there are no colors.
-set errorcolor brightwhite,red
-set functioncolor magenta
-set keycolor brightwhite
-set numbercolor brightwhite,magenta
-set selectedcolor brightwhite,blue
-set statuscolor brightwhite,magenta
-set stripecolor brightblue
-set titlecolor brightwhite,magenta
-
-
-## Include all existing syntax highlight definitions.
-include "/usr/share/nano/*.nanorc"
-
-
-## Key bindings.
-## The following five functions are not bound to any key by default.
-## You may wish to choose different keys than the ones suggested here.
-# bind ^S savefile main
-# bind M-Q findprevious main
-# bind M-W findnext main
-# bind M-B cutwordleft main
-# bind M-N cutwordright main
-## Set this if your Backspace key sends Del most of the time.
-# bind Del backspace all
diff --git a/.nanorc-5.2 b/.nanorc-5.2
deleted file mode 100644
index 51300c3..0000000
--- a/.nanorc-5.2
+++ /dev/null
@@ -1,118 +0,0 @@
-## Sample initialization file for GNU nano.
-##
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read!  Also note that this file should not be in
-## DOS or Mac format, and that characters specially interpreted by the
-## shell should not be escaped here.
-##
-## To make sure an option is disabled, use "unset <option>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## Quotes inside string parameters don't have to be escaped with
-## backslashes.  The last double quote in the string will be treated as
-## its end.  For example, for the "brackets" option, ""')>]}" will match
-## ", ', ), >, ], and }.
-
-## When soft line wrapping is enabled, make it wrap lines at blank characters.
-set atblanks
-
-## Use auto-indentation.
-# set autoindent
-
-## Automatically hard-wrap the current line when it becomes overlong.
-# set breaklonglines
-
-## Do case-sensitive searches by default.
-# set casesensitive
-
-## Do not use the line below the title bar.
-# set emptyline
-
-## Set the line length for wrapping text and justifying paragraphs.
-set fill -2
-
-## Draw a vertical stripe at the given column
-# set guidestripe 140
-
-## Remember the used search/replace strings for the next session.
-set historylog
-
-## Display a "scrollbar" on the righthand side of the edit window.
-# set indicator
-
-## Scroll the buffer contents per half-screen instead of per line.
-# set jumpyscrolling
-
-## Display line numbers to the left of the text area.
-set linenumbers
-
-## Enable vim-style lock-files.
-set locking
-
-## Don't display the helpful shortcut lists at the bottom of the screen.
-set nohelp
-
-## Don't add newlines to the ends of files.
-# set nonewlines
-
-## Do quick statusbar blanking.
-set quickblank
-
-## Do extended regular expression searches by default.
-# set regexp
-
-## Make the Home key smarter.
-set smarthome
-
-## Enable soft line wrapping (AKA full-line display).
-# set softwrap
-
-## Use this spelling checker instead of the internal one.
-set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-set suspendable
-
-## When justifying text, trailing whitespace will automatically be removed.
-set trimblanks
-
-## The two characters used to indicate the presence of tabs and spaces.
-set whitespace »·
-
-## Detect word boundaries more accurately by treating punctuation
-## characters as parts of words.
-# set wordbounds
-
-## Let an unmodified Backspace or Delete erase the marked region, without affecting the cut-buffer.
-# set zap
-
-
-## Paint the interface elements of nano.
-## This is an example; by default there are no colors.
-set errorcolor brightwhite,red
-set functioncolor magenta
-set keycolor brightwhite
-set numbercolor magenta
-set selectedcolor brightwhite,blue
-set statuscolor magenta
-# set stripecolor brightblue
-set stripecolor magenta
-set titlecolor magenta
-
-
-## Include all existing syntax highlight definitions.
-include "/usr/share/nano/*.nanorc"
-
-
-## Key bindings.
-## The following five functions are not bound to any key by default.
-## You may wish to choose different keys than the ones suggested here.
-# bind ^S savefile main
-# bind M-Q findprevious main
-# bind M-W findnext main
-# bind M-B cutwordleft main
-# bind M-N cutwordright main
-## Set this if your Backspace key sends Del most of the time.
-# bind Del backspace all
diff --git a/.nanorc-5.5 b/.nanorc-6.0
similarity index 93%
rename from .nanorc-5.5
rename to .nanorc-6.0
index 5d2998f..a12a42c 100644
--- a/.nanorc-5.5
+++ b/.nanorc-6.0
@@ -72,9 +72,6 @@ set smarthome
 ## Use this spelling checker instead of the internal one.
 set speller "aspell -x -c"
 
-## Allow nano to be suspended.
-set suspendable
-
 ## When justifying text, trailing whitespace will automatically be removed.
 set trimblanks
 
@@ -88,6 +85,12 @@ set whitespace »·
 ## Let an unmodified Backspace or Delete erase the marked region, without affecting the cut-buffer.
 # set zap
 
+# Show flags in the title bar.
+set stateflags
+
+# Use libmagic for syntax highlighting suggestions.
+set magic
+
 
 ## Paint the interface elements of nano.
 ## This is an example; by default there are no colors.
@@ -116,3 +119,9 @@ include "/usr/share/nano/*.nanorc"
 # bind M-N cutwordright main
 ## Set this if your Backspace key sends Del most of the time.
 # bind Del backspace all
+
+# Unbind the ^J (justification) shortcut as it's annoying.
+unbind ^J main
+
+# Allow ^Z to suspend nano.
+bind ^Z suspend main