7ae8f3bca4
tweaks: elide a function that is used just once
2018-07-08 10:40:22 +02:00
2e1e157967
copyright: update the years for significantly changed files
2018-06-01 10:18:32 +02:00
fce54a724d
tweaks: fix some grammar plus a typo in the comments
2018-05-27 20:19:46 +02:00
119a6f0de3
rcfile: don't crash when a bind to a string lacks the closing quote
...
This fixes https://savannah.gnu.org/bugs/?53972 .
Reported-by: Marco Diego Aurélio Mesquita <marcodiegomesquita@gmail.com>
2018-05-25 13:15:52 +02:00
c07586d9f3
tweaks: condense some repetitious comments, and check before assigning
...
Check that the option argument is okay (contains no blank characters),
before assigning it to the relevant variable.
2018-05-24 20:49:29 +02:00
f5eeb92f40
tweaks: sort an option better, and reschedule a removal
2018-05-13 09:47:40 +02:00
858663444e
new feature: an option to make the 'nextword' function stop at word ends
...
When 'afterends' is set and Ctrl+Right or Shift+Ctrl+Right is pressed,
nano will stop at the ends of words instead of their beginnings.
Signed-off-by: Mark-Weston <markweston@cock.li>
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
2018-05-10 11:32:01 +02:00
bf8bd02558
build: do not prefix an alternative rcfilename with a dot
...
When the user configures nano with --enable-altrcname=name,
the specified name should not be prefixed with a dot.
This fixes https://savannah.gnu.org/bugs/?53694 .
Reported-by: Cody A. Taylor <codemister99@yahoo.com>
2018-04-21 10:03:30 +02:00
0b30835dd0
tweaks: use meaningful names instead of puzzling values
...
Suggested-by: Brand Huntsman <alpha@qzx.com>
2018-04-01 09:49:58 +02:00
0cd833e64b
tweaks: move a function to its proper location
...
Put it after the function that it calls, and before the functions
it is called from.
2018-03-30 10:34:40 +02:00
cbf226476d
rcfile: skip color commands where some color name is invalid
...
That is, do not fall back to the default background color when the
name for the background color is invalid, but reject the entire
color command, just like for an invalid foreground color.
2018-03-30 10:30:55 +02:00
570fb6c606
small addition: understand color name "normal" to mean the default color
...
This allows a syntax to remove the color from things that were colored
overeagerly by earlier regexes.
2018-03-28 14:03:22 +02:00
7b1f3f4fe7
tweaks: correct several parameter types
...
This avoids a bunch of warnings when compiled with -pedantic:
ISO C forbids comparison of ‘void *’ with function pointer
2018-03-18 20:01:25 +01:00
a1be8b6a19
tweaks: condense a comment and elide an 'if'
2018-03-01 11:18:56 +01:00
de4fbadf20
tweaks: reshuffle some code, to be slightly less ugly
2018-03-01 11:08:13 +01:00
bdd8920081
bindings: make a key defined as string work also in browser and viewer
2018-03-01 10:55:04 +01:00
5eccaa7633
tweaks: refactor the implanting of a key expansion
2018-02-27 13:34:32 +01:00
c757aee235
tweaks: correct a typo that broke binding a key to a string
...
Commit 0cf455bc
2018-02-27 10:28:52 +01:00
ffebd31cbb
tweaks: shorten the name of two record elements
...
Exclude the confusing, pleonastic 'sc' abbreviation from their names.
2018-02-24 19:31:11 +01:00
b027263a37
small addition: allow customizing the color of an error message
...
The new option 'set errorcolor' allows the user to specify the color
combination for the status bar when an error message is displayed.
2018-02-23 12:35:17 +01:00
0cf455bc48
build: fix compilation when configured with --enable-tiny
...
And when configured with --enable-tiny --enable-nanorc.
2018-02-14 19:29:29 +01:00
3e1fc6385b
syntaxes: remove quotes from each syntax name, and color it differently
...
The different color will make the name stand out, as it should, instead
of looking the same as all the regex strings.
2018-02-14 17:36:50 +01:00
544cda6a62
rcfile: allow a syntax name to be unquoted
2018-02-14 17:35:37 +01:00
467cc8edf3
tweaks: remove two deprecated options and six rebindable function names
...
This addresses https://savannah.gnu.org/bugs/?48992 .
2018-02-04 13:51:13 +01:00
6d111c9343
new feature: allow binding a key to a string (in a nanorc file)
...
In this way a single keystroke can produce a fragment of text or a
series of commands, or a mix of the two. It is like a prerecorded
macro.
This fulfills https://savannah.gnu.org/bugs/?52931 .
2018-02-04 12:44:12 +01:00
7b9bd65362
tweaks: drop a useless assert, and don't abort over an unhandled option
2018-01-24 10:29:50 +01:00
f72fecee9b
copyright: update the years for the FSF
...
And one for me, for the much changed keyboard stuff.
2018-01-24 10:14:43 +01:00
d85098abda
tweaks: reshuffle a couple of lines, to make a bit more sense
2018-01-19 20:27:53 +01:00
13f8ddcaf2
tweaks: remove a handful of redundant (because always true) asserts
...
And rewrap some lines, three of them to make them equal to another.
2018-01-19 20:09:06 +01:00
37e9ada964
tweaks: change a 'do' to a 'while', and return early to elide an 'if'
2018-01-19 18:05:24 +01:00
a99158c7c0
tweaks: remove a fragment of dead code
...
At that point, ptr will necessarily point at EOL -- *ptr == '\0'.
2018-01-19 17:56:17 +01:00
704a7d7b4f
tweaks: rename two variables, for preciseness and shortness
...
Also remove an unneeded nulling.
2018-01-15 16:38:13 +01:00
64366d9992
startup: make an error message succinct and to the point
...
The verbosity "hid" the really relevant information:
filename, line number, and the error message.
Valid values and other details can be found in the manual pages.
2018-01-15 13:24:14 +01:00
bd97ae7255
tweaks: set a modifier in a single place, for conciseness
2018-01-15 13:15:23 +01:00
2ff398c685
tweaks: reshuffle some stuff, and avoid a memory leak
2018-01-15 13:07:42 +01:00
4b24ce1c11
startup: parse interface colors when they are read, not when initialized
...
When the palette is getting initialized, it is too late to send any
error messages about the rcfile options to standard error.
This fixes https://savannah.gnu.org/bugs/?52871 .
Reported-by: Brand Huntsman <alpha@qzx.com>
Signed-off-by: Brand Huntsman <alpha@qzx.com>
2018-01-15 13:04:55 +01:00
87206c0607
tweaks: convert the indentation to use only tabs
...
Each leading tab is converted to two tabs, and any leading four spaces
is converted to one tab. The intended tab size (for keeping most lines
within 80 columns) is now four.
2017-12-29 20:06:50 +01:00
62ebd93579
tweaks: use printf's z modifier for (s)size_t, instead of casting
2017-12-26 14:11:18 +01:00
66fd6a5ab1
options: rename 'justifytrim' to 'trimblanks', because it has morphed
...
The option now causes nano to trim trailing whitespace also when
hardwrapping occurs while the user is typing.
2017-12-06 20:38:13 +01:00
5239e7c52b
copyright: update some years, and standardize on the dashed format
2017-11-12 10:46:20 +01:00
2122a1a2b5
tweaks: constify the result strings of getenv(), as a reminder
...
Also, remove an unneeded pair of braces.
2017-11-10 20:03:07 +01:00
e2d3bba86c
general: do not free strings gotten from getenv(), to avoid a crash
...
Signed-off-by: Marco Diego Aurélio Mesquita <marcodiegomesquita@gmail.com>
2017-11-10 19:55:44 +01:00
c16e79b612
startup: look for nanorc and history files also in the XDG directories
...
When not finding a .nanorc file in the user's home directory, nano will
look for a nanorc file in $XDG_CONFIG_HOME and in the ~/.config/nano/
fallback directory. And when not finding a .nano/ subdir in the user's
home directory, nano will look for (or create) the history files in
$XDG_DATA_HOME or in the ~/.local/share/nano/ fallback directory.
This is a partial implementation of the XDG Base Directory Specification:
https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html ,
for the purpose of reducing the clutter in a user's home directory, and
to make it easier to back up just the configuration files.
Signed-off-by: Simon Ochsenreither <simon@ochsenreither.de>
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
2017-11-04 20:11:57 +01:00
1463781247
startup: when an rcfile contains errors, report this on the status bar
...
Suggested-by: Brand Huntsman <alpha@qzx.com>
2017-11-02 17:30:14 +01:00
c3a11fb7ed
options: remove '--quiet' and 'set quiet', because they hide problems
...
If the user uses a single version of nano, they have no need for
--quiet. If they do sometimes use an older version and don't want
to see the warnings, they can use 2>/dev/null (they could make an
alias for that and put it before the call of nano).
2017-11-02 17:27:53 +01:00
953c2b8e79
startup: don't ask the user to press Enter upon an rcfile error
...
The user told nano to start, thus nano should *start* -- without
halting and without nagging the user.
2017-11-02 17:22:21 +01:00
d5ac1ed395
tweaks: transform the token DISABLE_COLOR to ENABLE_COLOR
2017-11-01 19:45:50 +01:00
2a4fc9591f
tweaks: transform the token DISABLE_SPELLER to ENABLE_SPELLER
2017-10-31 19:32:42 +01:00
f034992ed6
tweaks: transform the token DISABLE_WRAPJUSTIFY to ENABLED_WRAPORJUSTIFY
2017-10-31 17:40:54 +01:00
db0b849f9b
tweaks: transform the token DISABLE_JUSTIFY to ENABLE_JUSTIFY
2017-10-31 17:40:44 +01:00
4e03a245ac
tweaks: adjust two comments, and correct and a few cosmetic mistakes
2017-10-30 19:12:22 +01:00
028d12f4fb
tweaks: transform the token DISABLE_OPERATINGDIR to ENABLE_OPERATINGDIR
2017-10-29 21:08:07 +01:00
a5974bd1ec
tweaks: transform the token DISABLE_WRAPPING to ENABLE_WRAPPING
2017-10-29 21:00:09 +01:00
ff35a61355
tweaks: transform the token DISABLE_HISTORIES to ENABLE_HISTORIES
2017-10-29 19:43:05 +01:00
7c3c3cbb3b
tweaks: discard some obsolete debugging stuff
2017-09-22 21:59:51 +02:00
5237a42d65
weeding: remove the unused be_clever parameter from do_home()/do_end()
2017-08-18 20:44:46 +02:00
8555820afc
tweaks: rename a label, to better match its task
2017-08-16 22:00:10 +02:00
e7bdfebdf4
rcfile: don't leak a shortcut when something goes wrong [coverity scan]
2017-08-16 21:56:56 +02:00
1cc030f7c1
bindings: hard-bind Alt+Left and Alt+Right to buffer switching
...
This also fixes https://savannah.gnu.org/bugs/?51735 .
Reported-by: Urja Rannikko <urjaman@gmail.com>
Signed-off-by: Urja Rannikko <urjaman@gmail.com>
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
2017-08-14 10:06:29 +02:00
11072ed587
tweaks: sort the includes, so it's a little easier to see what is there
2017-08-06 19:40:30 +02:00
1c1cbae6bc
small addition: allow customizing the color of selected text
...
The new option 'set selectedcolor' applies to marked text, to the
currently selected file in the file browser, and to the highlighted
match during interactive search-and-replace.
2017-08-06 09:30:32 +02:00
80686bb525
tweaks: remove includes that appear to be superfluous
...
Without them, nano still compiles for me, with everything enabled,
even when using --enable-debug, --enable-utf8, and --with-slang.
2017-08-06 09:08:30 +02:00
829a1a5050
new feature: allow pasting at all input prompts
...
Include the shortcut for 'Uncut' into most menus, and add an uncut
function for the status bar, so that it becomes possible to paste
the first line of the cutbuffer at any text-input prompt.
This fulfills https://savannah.gnu.org/bugs/?48501 .
Requested-by: Benno Schulenberg <bensberg@telfort.nl>
Signed-off-by: Rishabh Dave <rishabhddave@gmail.com>
2017-07-29 13:48:22 +02:00
1e2d9a697a
tweaks: rename a constant, to match the corresponding option
2017-07-14 16:14:02 +02:00
63c428ad08
options: rename --cut to --cutfromcursor, to be clearer
...
Rename the corresponding rc-file option too, of course.
2017-07-14 16:06:52 +02:00
bb4d0d548a
new feature: allow lines to be softwrapped at whitespace
...
Extend get_softwrap_breakpoint() to break softwrapped lines on
whitespace when a flag is set. This flag is controlled by the new
rcfile option "atblanks". The '>' characters marking two-column
characters at the edge of the screen are disabled when it's on.
If get_softwrap_breakpoint() can't find whitespace in screen range, it
will break the line on the screen edge. (In this case, a blank can be
on the last column of the screen, but text can't, so that a blank on the
last column doesn't become invisible and possibly break the display.)
This fulfills https://savannah.gnu.org/bugs/index.php?49959 .
Requested-by: Nicholas Boel <axxisd@gmail.com>
2017-07-07 13:07:10 +02:00
1439016c20
tweaks: recognize the empty string as comment inhibitor, instead of NULL
2017-07-07 10:15:17 +02:00
a7901dd1e0
rcfile: don't require backslashing in the argument of 'comment'
...
Eradicate the need for backslashes, so that the start of the nanorc
manual becomes true, where it says that quotes inside strings don't
need to be escaped. In the bargain achieve that the empty string
always switches commenting off.
This fixes https://savannah.gnu.org/bugs/?51370 ,
and fixes https://savannah.gnu.org/bugs/?51394 .
2017-07-07 10:15:17 +02:00
f46544f67b
tweaks: chuck two useless asserts, and elide a call to strncasecmp()
2017-07-06 10:31:35 +02:00
9462ba8217
tweaks: simplify the parsing of color combinations
2017-07-06 09:46:17 +02:00
6295cca03b
tweaks: correct a parameter type, and correct two empty initializations
...
This avoids some warnings when compiled with -pedantic:
ISO C forbids comparison of ‘void *’ with function pointer
ISO C forbids empty initializer braces
2017-07-03 09:40:55 +02:00
84b6525914
tweaks: adjust an error message so it fits all possible cases
...
The thing after a 'comment' directive is just a string, not the
name of a program nor a command.
2017-07-02 19:55:28 +02:00
2abe7c03fe
text: make sure commenting is disabled when comment "" was specified
...
When the active syntax contains a comment command that specifies the
empty string, this should override the default comment of "#" and
should disable the Meta-3 keystroke.
To achieve this, the comment string is now set by default to "#" for
all syntaxes, so that it will be set when no comment command is given
(including for the "none" syntax), and is unset only by explicitly
specifying «comment ""» in a syntax file.
This fixes https://savannah.gnu.org/bugs/?51355 .
Reported-by: David Lawrence Ramsey <pooka109@gmail.com>
2017-07-02 19:44:56 +02:00
bf72cdd814
tweaks: rename two variables, to make a little sense
...
And rename a third variable, to match another in its style.
2017-07-02 12:05:12 +02:00
4239e5fe1a
tweaks: put declarations always first, so it will compile on Haiku
2017-07-02 11:53:59 +02:00
621eb904b3
bindings: in the tiny version exclude word jumping from the prompts
...
In the tiny version, Ctrl+Left and Ctrl+Right are available only
in the editor itself and in the file browser.
This fixes https://savannah.gnu.org/bugs/?51173 .
2017-06-04 11:13:03 +02:00
858e75e4cf
tweaks: transform the token DISABLE_NANORC to ENABLE_NANORC
...
Also, allow rebinding the word and block jumping functions
in the tiny version when nanorc files are reenabled.
2017-05-09 11:59:34 +02:00
5033cfd81a
tweaks: transform the token DISABLE_MOUSE to ENABLE_MOUSE
...
Also, trim some comments and avoid an unused-variable warning.
2017-05-01 20:53:07 +02:00
9c3a149b14
tweaks: transform the token DISABLE_MULTIBUFFER to ENABLE_MULTIBUFFER
2017-05-01 20:20:34 +02:00
1fbe7596f8
options: allow -U (--quickblank) to be used in the tiny version
...
It takes almost no code and is a useful little improvement over Pico.
2017-04-19 13:47:40 +02:00
74f128859b
tweaks: rename a constant, to match the corresponding option
2017-04-17 11:51:48 +02:00
754c62c5cc
copyright: update the years, use ranges, and explain this usage
...
The interval 2013-2017 for the Free Software Foundation is valid
because in those years there were releases with changes by either
Chris or David, and the GNU maintainers guide advises to mention
a new year in all files of a package, not just in the ones that
actually changed, and be done with it for the rest of the year.
2017-04-09 12:09:23 +02:00
d8189703b1
tweaks: prepare for improvements to do_home() and do_end()
...
These improvements will eventually make do_home() and do_end() take
parameters. Since the global function lists can hold only functions
without parameters, preemptively add do_home_void() and do_end_void(),
and make the global function lists use them.
2017-03-22 10:44:04 +01:00
6d873d3760
startup: add option 'nopauses' to disable pausing after a warning
...
This addresses a followup of https://savannah.gnu.org/bugs/?50362 .
Reported-by: Mike Frysinger <vapier@gentoo.org>
2017-03-16 19:26:39 +01:00
636b7348a6
tweaks: make sure calls to <ctype.h> functions/macros use "unsigned char"
...
The platform's default char type might be signed, which could cause
problems in 8-bit locales.
This addresses https://savannah.gnu.org/bugs/?50289 .
Reported-by: Hans-Bernhard Broeker <HBBroeker@T-Online.de>
2017-03-06 20:58:25 +01:00
3deec4352b
assume regex.h support is always available
...
Now that we pull in the gnulib regex module, we can assume it exists.
2017-03-06 12:01:08 +01:00
de36e1c120
tweaks: rename a variable, to be more general
2017-02-16 13:27:09 +01:00
a8c1dc1402
rcfile: don't accept empty regexes for syntax coloring
...
As a small service to the user, reject empty regex strings,
because an entirely empty regex simply doesn't make sense.
Inspired-by: Elia Geretto <elia.f.geretto@gmail.com>
2017-02-16 13:25:38 +01:00
eca6faee5b
tweaks: free an option string also when it was invalid
2017-01-11 09:49:24 +01:00
ecccb8d027
tweaks: correct the wording of a string
2016-12-07 21:06:05 +01:00
c1a484270b
rcfile: actually avoid opening directories and devices
...
Achieve this elegantly by factoring out the reading of one rcfile.
2016-11-27 18:21:04 +01:00
981a1d39bf
tweaks: factor out a small function
2016-11-27 17:30:53 +01:00
925a001658
rcfile: check the vital shortcuts just once, not for every included file
2016-11-27 16:40:54 +01:00
77023a749b
tweaks: remove an annoying conditional compilation of an argument
...
Also remove some unneeded prototypes, adjust some comments, and
move a constant definition to the top of the file.
2016-11-27 16:34:34 +01:00
1762920808
rcfile: actually don't try to open things that cannot be syntax files
2016-11-26 17:48:31 +01:00
281a56fb74
tweaks: reshuffle some things in a more linear manner
...
Also improve or correct some comments.
2016-11-26 17:42:27 +01:00
65bf36baa5
rcfile: let a 'set fill' reenable hardwrapping
...
Otherwise the user can override a 'set nowrap' in /etc/nanorc only
via the command line.
This fixes https://savannah.gnu.org/bugs/?49593 reported by Shirish.
2016-11-13 19:47:15 +01:00
de2aa4f24a
rcfile: add an option to customize the color of line numbers
2016-10-20 16:48:45 +02:00
de95ca68f7
new feature: the ability to show line numbers before the text
...
It can be activated with --linenumbers on the command line or with
'set linenumbers' in a nanorc file, and it can be toggled with M-#.
Signed-off-by: Faissal Bensefia <faissaloo@gmail.com>
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
2016-10-20 16:47:52 +02:00
55878efe5d
binding: supply the keycode for most special keys directly
...
Instead of figuring them out from the string. This is possible
because those dedicated editing keys cannot be rebound anyway.
2016-10-18 20:38:27 +02:00
01bf034bb6
rcfile: reject rebindings that have no effect or have side effects
...
Also, show in green only the ^ and M- combinations that are valid.
This fixes https://savannah.gnu.org/bugs/?49097 .
Signed-off-by: Rishabh Dave <rishabhddave@gmail.com>
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
2016-10-11 19:46:18 +02:00
e2027aee15
rcfile: reject key names that are wrong or too long
...
Meta keys should have a dash as second character, and apart from ^Space
and M-Space key names should be at most two or three characters long.
This fixes https://savannah.gnu.org/bugs/?44688 .
Reviewed-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Rishabh Dave <rishabhddave@gmail.com>
2016-09-14 19:53:38 +02:00
08cd197bf1
general: include word-jumping and block-jumping into the tiny version
...
And also case-sensitive searches, backward searches, and searching again.
2016-09-13 09:27:04 +02:00
b92d35d1f2
browser: add the option showcursor, to place the cursor on the highlight
...
This lets users of braille displays find the selected item immediately.
This fulfills a request by Enrico Mioso.
See https://lists.gnu.org/archive/html/nano-devel/2016-09/msg00025.html .
2016-09-11 09:41:52 +02:00
7b7d2bf7c9
tweaks: make tiny nano a teeny bit smaller
2016-09-02 12:01:03 +02:00
514cd9a099
update the license text to the preferred version
...
Mentioning "GNU nano" instead of "This program" and referring to the
website instead of to a postal address.
2016-08-29 21:27:16 +02:00
406e5242a3
update the copyright notices
2016-08-29 21:27:05 +02:00
1c9ab8bf16
tweaks: rename a struct element, to be more fitting
...
The keycode is not a sequence; it is a single integer value.
2016-07-30 12:24:35 +02:00
e295070193
shortcuts: group the setting of key string and keycode into one function
...
And instead of using two key types, just use a bool to indicate whether
a keystroke involves Meta.
2016-07-30 12:21:42 +02:00
5b0ab8be62
shortcuts: remove any unnecessary classifying of keys
...
After initialization, the type of a key is never used nor needed
(other than for meta keys).
2016-07-30 12:13:47 +02:00
1e5614b31b
tweaks: avoid two compiler warnings
2016-07-22 15:48:06 +02:00
6f12992cea
new feature: add the option --wordchars, to set extra word characters
...
This allows the user to specify which other characters, besides the
default alphanumeric ones, should be considered as part of a word, so
that word operations like Ctrl+Left and Ctrl+Right will pass them by.
Using this option overrides the option --wordbounds.
This fulfills https://savannah.gnu.org/bugs/?47283 .
2016-07-13 20:49:30 +02:00
d88423eaae
tweaks: move a debug statement to its proper place, and improve aspect
2016-07-13 20:48:03 +02:00
6a2032f5b0
new feature: comment/uncomment current line or selected lines
...
This allows for commenting or uncommenting a line or a bunch of lines
with a single keystroke (default binding: M-3). The characters used
for commenting/uncommenting are specified by the active syntax file.
Reviewed-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Mike Scalora <mike@scalora.org>
2016-05-25 22:29:50 +02:00
cdcd365d34
tweaks: normalize some whitespace
2016-05-17 11:33:21 +02:00
f1b9ba2781
rcfile: make an error message equal to another, and more informative
2016-05-04 10:22:28 +02:00
9330aa60a5
rcfile: disallow 'bind' and 'unbind' in an included file
...
Included files are meant to contain only syntax definitions; they may
not set or unset options, nor rebind keys, nor include other files.
This fixes https://savannah.gnu.org/bugs/?47391 .
2016-04-27 10:07:45 +02:00
d92eb4fee3
all: eradicate SVN's $Id$ tags
2016-04-05 14:59:12 +02:00
2f817a6740
Checking for the existence of the REG_ENHANCED regex flag, and
...
using it when it's available (which it is on OS X systems).
This completes the fix for Savannah bug #47325 .
Patch by Thomas Rosenau.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5759 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-22 10:42:28 +00:00
8866f728a2
Rearranging some things to reduce the indentation level by four steps,
...
so we can unwrap a dozen lines.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5737 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-14 17:14:35 +00:00
7070812004
Making an error message equal to others, to reduce the msgid count.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5736 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-14 16:09:52 +00:00
8fbb922868
Renaming a variable, from 'endcolor' to 'lastcolor', to fully avoid
...
the idea that it might have something to do with 'end_regex'.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5733 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-13 20:05:36 +00:00
6ed6462154
Combining the regular-expression flags at compile time instead of at run time.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5732 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-13 19:37:21 +00:00
63d59656d3
Refinding the tail of the colors list only when extending,
...
not for every added color, thus saving some 15 microseconds.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5729 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-12 11:15:12 +00:00
f72e16502e
Renaming a variable.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5728 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-12 10:21:02 +00:00
fa82824a59
Reducing the indentation by short-circuiting a loop.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5727 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-12 09:52:16 +00:00
3cb80ff7ea
Renaming two functions, to be more distinguishable --
...
a leading underscore as the only difference is not enough.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5726 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-12 09:43:10 +00:00
1786484486
Fixing compilation when configured with --enable-tiny plus --enable-nanorc.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5722 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-11 17:14:30 +00:00
d08d72a05d
Checking for an open syntax first, before checking it is named "default".
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5721 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-11 16:51:15 +00:00
6e37723fbe
Eliding a variable.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5720 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-11 16:45:00 +00:00
b8aae4d872
Tweaking some comments and reshuffling/reindenting some lines.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5719 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-11 16:39:27 +00:00
8a5ae2130b
Renaming a variable to better fit its new role.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5717 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-10 20:36:12 +00:00
04262f09a4
Turning the linked list of syntaxes upside-down, so that the last-defined one
...
comes first, so that a search can stop at the first match instead of always
having to run through the entire list.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5716 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-10 20:06:01 +00:00
ed296525f4
Eliding the functions parse_header_exp() and parse_magic_exp(),
...
and reshuffling the parameters in grab_and_store().
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5715 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-10 11:00:59 +00:00
837b4e66e2
Folding the parsing of a linter and formatter command into a single routine.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5714 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-10 10:36:49 +00:00
2994ea9d02
Not accepting 'header" and 'magic' commands for the default syntax.
...
This fixes Savannah bug #47323 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5713 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-10 09:46:21 +00:00
2f63e8dfc1
Using the grab_and_store() function also for gathering up extension regexes.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5712 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-09 21:00:42 +00:00
b0bdfbb0f7
Producing an adequate error message when the syntax name is improperly quoted.
...
This fixes Savannah bug #47324 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5711 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-09 20:28:50 +00:00
6a4d3aad80
Tweaking a few things and renaming a variable.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5710 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-04 20:50:38 +00:00
c02c182bd7
Deleting a now-unused struct member.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5707 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-04 17:04:56 +00:00
3df1a3f0f4
Not bothering to discard a duplicate syntax -- selecting simply the
...
last-defined one. This addresses Savannah bug #47303 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5704 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-03-01 11:06:00 +00:00
e39423b49d
Fixing breakage of r5695 -- I confused nregcomp() with regcomp(). :(
...
Hhrr... Names that don't seem to differ...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5702 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-29 15:40:13 +00:00
04669b5635
Renaming a variable and reshuffling a few lines.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5701 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-29 12:17:53 +00:00
85e166b0f2
"Closing" an extended syntax again, to prevent sneakily extending
...
the last-defined syntax.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5700 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-29 12:04:22 +00:00
773fc447df
Arranging some things more orderly.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5699 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-29 10:54:48 +00:00
717e697e0b
Not allocating a struct for the "none" syntax -- it doesn't need any.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5698 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-29 10:29:52 +00:00
a24aee417d
Renaming a struct member.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5697 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-29 09:17:03 +00:00
275e9f0092
Disallowing the addition of further things to a syntax when
...
an rcfile ends or when an invalid syntax command is found.
This fixes Savannah bug #47207
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5696 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-28 20:38:14 +00:00
68d94a0c74
Rearranging a few things in my style.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5695 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-28 17:16:39 +00:00
07f71e6c1a
Not dropping regexes that were gathered earlier.
...
This fixes Savannah bug #47285 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5694 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-28 16:36:23 +00:00
c2148cc902
Renaming a variable and fusing an increment.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5693 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-28 15:47:37 +00:00
1fba31e7b5
Using the now correct parsing of header regexes also for parsing magic regexes.
...
This fixes Savannah bug #47292 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5692 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-28 15:16:27 +00:00
3e7591f534
Not continuing when something is wrong, but instead skipping the rest of
...
the line. This fixes Savannah bug #47289 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5691 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-28 11:04:36 +00:00
07441adb14
Renaming another struct element, because it refers not just
...
to file extensions, but also to header lines and magic strings.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5690 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-26 20:19:13 +00:00
3522751c6b
Renaming a struct element for aptness and contrast.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5689 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-26 20:09:29 +00:00
9f98333dce
Call kill_spaces_on_justify justifytrim, to match the rest of rcfile naming conventions.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5679 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-25 21:04:45 +00:00
0dec394303
Make that kill_spaces_on_justify, add hilighting.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5665 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-22 15:23:57 +00:00
6a0ae5aaa2
2016-02-22 Chris Allegretta <chrisa@asty.org>
...
* Add ability to kill the trailing spaces when justifying
code. New nanorc option kill_spaces_on_wrap, we'll see
whether this warrants a command line flahg or not.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5664 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-22 15:10:32 +00:00
14d1b3bd36
Allowing only control sequences in the proper range to be rebound.
...
This fixes Savannah bug #47025 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5625 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-10 15:06:45 +00:00
6829241433
Removing the --nofollow option that hasn't been working for a dozen years.
...
With this option, nano would simply refuse to write to any symlinked file;
if anyone really used this option, they would certainly have complained.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5608 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-02-06 10:59:31 +00:00
63370954bd
Showing a key only when it was rebound.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5562 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-01-14 14:44:11 +00:00
33fb1746dd
Eliding an unneeded function.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5561 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2016-01-14 14:34:05 +00:00
eac0446c86
Fixing compilation with --enable-tiny: file formats don't exist then.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5349 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-08-09 16:31:01 +00:00
70cbbda87c
Adding the option --unix (and 'set unix'),
...
to save a file by default in Unix format.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5342 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-08-04 18:49:57 +00:00
95e1f55574
Plugging a tiny leak.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5341 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-08-03 19:52:48 +00:00
3d2784e113
Checking the value of shortcut->toggle only if it actually is a toggle.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5339 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-08-03 08:03:22 +00:00
474b390816
Plugging a few memory leaks.
...
Patch by Mike Frysinger.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5314 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-07-22 18:02:36 +00:00
1f866c29db
Renaming the 'menu' item to 'menus' in the shortcut struct.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5301 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-07-15 20:13:05 +00:00
cadb4f3689
Unabbreviating the long option --poslog to --positionlog.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5300 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-07-15 19:50:55 +00:00
79526151d5
Unabbreviating the long option --const to --constantshow.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5299 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-07-15 19:40:37 +00:00
5ac6a87522
Giving each toggle a sequence number, to be able to show them in a fixed order.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5282 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-07-06 17:51:17 +00:00
4499520c03
Removing the obsolete long option --undo, and sorting some things.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5265 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-06-20 18:48:43 +00:00
7c2f53b2a9
Allowing a tiny nano to enable search and position histories.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5256 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-06-18 18:51:27 +00:00
c32a58a826
Not checking for non-NULL before freeing a variable, as it's unnecessary.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5249 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-06-14 19:14:41 +00:00
1cf9deb603
Using mallocstrcpy() in a correct manner and
...
not letting it free an unrelated string.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5193 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-04-12 11:15:57 +00:00
d7ade1f346
Ignoring magic without libmagic, and ignoring formatter without spell checking.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5175 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-04-03 17:28:30 +00:00
de53c53c6e
Removing two superfluous #ifndefs.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5174 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-04-03 15:57:22 +00:00
79ff393dc2
Fixing the rebinding of toggles.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5134 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-03-08 15:42:52 +00:00
184cf609c0
2015-02-25 Chris Allegretta <chrisa@asty.org>
...
* src/rcfile.c (parse_binding): Add exception for do_toggle as
rebinding toggles broke with r5022.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5124 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-02-25 19:04:53 +00:00
4b3f2771b5
2015-01-03 Chris Allegretta <chrisa@asty.org>
...
* New formatter code to support syntaxes like
go which have tools to automatically lint and reformat the text for
you (gofmt), which is lovely. rcfile option formatter, function
text.c:do_formatter() and some other calls.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5100 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2015-01-03 07:24:17 +00:00
6f28d35eef
Fixing compilation with --enable-tiny --enable-nanorc.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5035 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-29 09:33:51 +00:00
4651f49fca
Allowing only those menus where the bound function is actually present,
...
when rebinding keys.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5022 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-27 16:14:52 +00:00
492e9f605b
Miscellaneous whitespace adjustments and comment tweaks.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4995 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-20 10:48:26 +00:00
b341f29cbd
Transform many DISABLE_NANORC #ifdefs to the new DISABLE_HISTORIES.
...
This completes the fix for Savannah bug #42539 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4989 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-19 20:05:24 +00:00
336d1b8902
Renaming 'function_type' to 'key_type', for clarity.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4983 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-18 20:43:05 +00:00
736fbf2e3f
Removing the --undo option, having the undo functions always enabled.
...
If wished, the user can unbind them. This fixes Savannah bug #42456 .
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4964 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-13 15:20:26 +00:00
7d5f42ca08
Using the right type to avoid a compiler warning.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4955 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-10 19:50:44 +00:00
ed0086bde5
Eliding four function calls by not comparing with an
...
empty string but checking for the terminating '\0'.
Patch by David Lawrence Ramsey.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4949 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-06-09 14:33:00 +00:00
044e4d2ae0
A few more comment tweaks.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4878 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-13 21:11:59 +00:00
71c9a5245a
Several random whitespace and comment tweaks.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4874 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-13 20:14:01 +00:00
111071af05
Improving another error message.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4868 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-13 08:34:29 +00:00
d2f3f2194e
Moving parse_magic_exp() next to its sister.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4865 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-12 19:57:12 +00:00
1d5134d93e
Renaming the struct type 'exttype' to 'regexlisttype', and upon exit
...
also freeing the regexes for libmagic results and headerlines.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4862 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-12 14:31:54 +00:00
cf4f80da9a
Renaming and symmetrifying two functions, and improving some comments.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4861 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-12 13:52:50 +00:00
8e01293b34
Handling the libmagic and headerline regexes in the same manner.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4860 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-12 12:57:00 +00:00
07f14de995
Improving some comments, and removing some mispasted or superfluous ones.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4858 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-12 12:11:24 +00:00
61523be8d2
2014-05-10 Chris Allegretta <chrisa@asty.org>
...
* src/rcfile.c (parse_color_names): Redefine false and true to
their appropriate macro names so --with-slang works (slangv2 anyway).
* src/text.c (do_linter): Care about whether user cancelled the file
save (cancel the operation) versus justy said no (continue but don't
save the file). Also doupdate() after statusbar message that
linter is being invoked and blank the shortcuts to draw the eye.
Also allow user to cancel at the "open in a new buffer" prompt.
New function lint_cleanup(). Fixes Savannah bug 42203.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4855 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-11 03:09:00 +00:00
1663994e42
Adding the ability to colour four elements of nano's interface differently.
...
Idea and original patch by Mark Majeres.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4827 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-05-03 18:24:45 +00:00
7a9f4a456e
Update the years in the copyright notices.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4826 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-04-30 20:18:26 +00:00
20011f4d41
Plugging two tiny memory leaks. Patch essentially by Mark Majeres.
...
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4819 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
2014-04-27 11:29:50 +00:00
Benno Schulenberg