Benno Schulenberg
34b1824822
syntax: default: don't colorize stuff between two pairs of brackets
...
That is, don't allow another bracket between the opening and the
closing bracket.
2019-10-25 12:23:40 +02:00
Jeroen Roovers
b025f67805
syntax: gentoo: highlight the BDEPEND variable as well
...
This fixes https://bugs.gentoo.org/698420 .
Reported-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
2019-10-24 17:24:06 +02:00
Benno Schulenberg
40f8ca0d07
syntax: html: colorize only full attributes, and colorize strings later
...
Attribute names that are a part of another word should not be colored,
nor should attribute names within strings.
This addresses the other half of https://savannah.gnu.org/patch/?9865 .
Original-patch-by: Ryan Westlund <rlwestlund@gmail.com>
2019-10-24 17:19:04 +02:00
Benno Schulenberg
aae752912e
syntax: javascript: colorize also special values 'null' and 'undefined'
...
This addresses one half of https://savannah.gnu.org/patch/?9865 .
Original-patch-by: Ryan Westlund <rlwestlund@gmail.com>
2019-10-24 17:19:04 +02:00
Benno Schulenberg
3c695664ec
tweaks: elide a function call for the plain ASCII case
...
When dealing with a plain, seven-bit ASCII character, don't bother
calling is_cntrl_mbchar() but determine directly whether it is a
control character. Also reshuffle things so that we don't compare
charlen == 1 when we already know it is 1.
2019-10-21 18:52:44 +02:00
Benno Schulenberg
8a7634f070
tweaks: rename two parameters plus a variable, to match others
...
Also improve a comment and normalize an indentation.
2019-10-21 13:02:17 +02:00
Benno Schulenberg
fa88fcc8f2
tweaks: rename a function, and elide a parameter that is always NULL
...
After the previous change, all remaining calls of parse_mbchar() have
NULL as their third parameter. So, drop that parameter and remove the
chunk of code that handles it. Also rename the function, as there are
already too many functions that start with "parse".
2019-10-21 12:35:14 +02:00
Benno Schulenberg
c2d8641f01
chars: add a faster version of the character-parsing function
...
It elides a parameter that is always NULL, and elides two ifs
that always take the same path.
2019-10-21 12:24:23 +02:00
Benno Schulenberg
3d5e51bcd0
syntax: nanorc: colorize in bright red everything that is invalid
...
Random words or mistyped keywords should not stay uncolored.
2019-10-20 14:47:15 +02:00
Benno Schulenberg
95ae124891
history: don't wait when there is something wrong with the history files
...
Do not wait for the user to press a key when there is some problem
with any of the history files. Just start and indicate the problem
on the status bar. The precise error message is stored and will be
shown on the terminal when exiting from nano.
This addresses https://savannah.gnu.org/bugs/?56524 .
2019-10-20 14:30:04 +02:00
Benno Schulenberg
1a8646393a
tweaks: condense a fragment of code by making use of a helper function
...
(It copies a byte too many, which then gets overwritten in the next
statement, but this is not speed-critical code.)
2019-10-20 09:45:58 +02:00
Benno Schulenberg
054559dc93
tweaks: rename three variables, to be more descriptive
2019-10-20 09:45:58 +02:00
Benno Schulenberg
fdeab9b4c9
tweaks: order two functions more sensibly
2019-10-20 09:45:58 +02:00
Benno Schulenberg
f26c121ca9
tweaks: adjust two comments, to better fit the actual functions
2019-10-20 09:45:58 +02:00
Benno Schulenberg
17c16a4bf5
tweaks: rename a function and elide its first parameter
2019-10-20 09:45:58 +02:00
Benno Schulenberg
46566572d6
utils: don't accept NULL for the string to be copied
...
This should not occur, so crash when it does happen.
2019-10-20 09:45:58 +02:00
Benno Schulenberg
b4a5fac744
tweaks: use a literal NULL instead of a variable that is NULL
...
Now all calls of mallocstrncpy() have NULL as the first parameter
(apart from one call in utils.c, but that can be changed), so the
function can be simplified.
2019-10-20 09:45:58 +02:00
Benno Schulenberg
f816da413a
tweaks: elide a variable that is the same as another
2019-10-18 17:12:51 +02:00
Benno Schulenberg
3a0ac428ba
tweaks: remove a redundant check for an existing emergency file
...
This case is caught (by O_EXCL) later on, at the appropriate moment:
when the file is created.
Also, this removes a superfluous lstat() for each temporary file.
2019-10-18 17:04:55 +02:00
Benno Schulenberg
97ab28a164
tweaks: exclude two fragments of code from the tiny version
...
Also improve a comment, and recorrect an indentation.
2019-10-18 14:25:55 +02:00
Benno Schulenberg
ccb739dd7d
tweaks: don't wrap calls of statusline() that slightly overshoot 80 cols
2019-10-18 14:04:15 +02:00
Benno Schulenberg
1082f2adec
files: don't mention the name of the temp file when reading goes wrong
...
When writing a temp file goes wrong, its name is not mentioned either.
2019-10-18 13:38:20 +02:00
Benno Schulenberg
042b8394a0
tweaks: use a simpler positive/negative check for after copy_file()
2019-10-18 13:25:38 +02:00
Benno Schulenberg
f2d6e6fa5e
tweaks: check the return value of copy_file() also after its other uses
2019-10-18 12:37:39 +02:00
Benno Schulenberg
5390f96900
files: distinguish between read error and write error when prepending
...
This fixes https://savannah.gnu.org/bugs/?57066 .
Bug existed in this form since version 2.4.3 -- in older versions
it segfaulted.
2019-10-18 12:15:14 +02:00
Benno Schulenberg
50ed18be17
tweaks: move a call of umask() closer to where it is relevant
2019-10-17 17:29:11 +02:00
Benno Schulenberg
a6365707c0
tweaks: remove the superfluous closing of a file descriptor
...
The file itself is closed three lines earlier; this also closes the
corresponding descriptor.
2019-10-17 16:43:07 +02:00
Benno Schulenberg
6fad6a17da
tweaks: rename a variable, to be distinct and visible
2019-10-17 12:17:09 +02:00
Benno Schulenberg
eb757e7c5b
tweaks: simplify the opening of files when prepending
...
There is no need for a file descriptor: all reading and writing
is done on streams.
2019-10-17 12:12:07 +02:00
Benno Schulenberg
b554606047
tweaks: add a local variable, for clarity, to not preuse another one
2019-10-17 11:49:21 +02:00
Benno Schulenberg
e915fb1650
tweaks: adjust the indentation after the previous change, and another
2019-10-17 11:45:03 +02:00
Benno Schulenberg
4e40ec057e
tweaks: elide an unneeded check when making a backup
...
When making a backup, we can be certain that the relevant file
is not a temporary file, so 'stream' will necessarily be NULL.
2019-10-17 11:45:03 +02:00
Benno Schulenberg
bd0026be86
tweaks: elide another two calls of umask(), and rename two variables
2019-10-17 11:43:42 +02:00
Benno Schulenberg
a1bef0e953
tweaks: avoid three unneeded calls of umask() in the normal case
2019-10-16 19:17:42 +02:00
Benno Schulenberg
f5693d4151
tweaks: elide a duplicate opening of the existing file when prepending
2019-10-16 17:40:52 +02:00
Benno Schulenberg
e3807f00a2
tweaks: rename two variables, and add a third, for more contrast
2019-10-16 17:16:48 +02:00
Benno Schulenberg
022cc084a7
files: when opening a file for copying, it should NOT be created
...
Weird bug. The first occurrence is probably never hit because the
existing file has been tentatively opened fourteen lines earlier,
but that looks superfluous: double work. And the second occurrence
will not be hit because the temp file is unlikely to have disappeared.
2019-10-16 16:27:23 +02:00
Benno Schulenberg
0f98466e2f
tweaks: adjust the indentation after the previous change
...
Also, don't bother assigning the stream pointer of the existing file
to variable 'f', as it gets overwritten right away by the pointer of
the temp file.
2019-10-16 16:05:40 +02:00
Benno Schulenberg
40c067133a
tweaks: remove two superfluous conditions when prepending
...
When prepending, we cannot be writing to a temp file,
so 'stream' (and thus 'f') will necessarily be NULL.
2019-10-16 15:47:35 +02:00
Benno Schulenberg
36270748dc
tweaks: condense or improve some comments
2019-10-16 13:47:30 +02:00
Benno Schulenberg
1894c81412
tweaks: rename two parameters, for contrast and to match others
2019-10-16 13:07:41 +02:00
Benno Schulenberg
e917ef0105
tweaks: die on an impossible condition -- to be removed later
2019-10-16 12:27:27 +02:00
Benno Schulenberg
3347682fd0
tweaks: remove a pointless updating of the title bar
...
A possible change in filename won't be pushed to the screen until a
doupdate() is done, and that won't happen until nano is waiting for
a keystroke again. So... just let it be.
2019-10-16 12:22:39 +02:00
Benno Schulenberg
7c5b104859
tweaks: rename three variables, to match others elsewhere
2019-10-16 11:46:22 +02:00
Benno Schulenberg
3b9a24a7ca
tweaks: rename a local variable, to not shadow another
2019-10-16 11:11:19 +02:00
Benno Schulenberg
7d3290fb91
tweaks: rename three variables, to be consistent with other linestructs
2019-10-16 11:04:26 +02:00
Benno Schulenberg
df0ae2ace5
tweaks: reshuffle a few declarations, and reduce the scope of one
2019-10-16 10:48:14 +02:00
Benno Schulenberg
bc91af2e3c
tweaks: pass an empty string as an answer instead of a NULL pointer
...
Also, rename a parameter, to be more distinct and to avoid an abbrev.
2019-10-15 13:39:57 +02:00
Benno Schulenberg
48b94d71c7
tweaks: pass an empty string for copying instead of a non-existent one
2019-10-15 11:49:07 +02:00
Benno Schulenberg
f14be47878
tweaks: move two functions to after the one that they make use of
2019-10-15 11:23:09 +02:00