Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
cs24-19fa
git_rec_nano
Commits
cdcd365d
Commit
cdcd365d
authored
8 years ago
by
Benno Schulenberg
Browse files
Options
Download
Email Patches
Plain Diff
tweaks: normalize some whitespace
parent
2535f51e
master
feature/match-parens
refactor/readbility
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
src/browser.c
+2
-2
src/browser.c
src/color.c
+1
-1
src/color.c
src/global.c
+2
-2
src/global.c
src/rcfile.c
+6
-6
src/rcfile.c
src/text.c
+3
-3
src/text.c
src/winio.c
+2
-2
src/winio.c
with
16 additions
and
16 deletions
+16
-16
src/browser.c
View file @
cdcd365d
...
...
@@ -744,9 +744,9 @@ void findnextfile(const char *needle)
/* If the needle matches, we're done. And if we're back at the file
* where we started, it is the only occurrence. */
if
(
strstrwrapper
(
thename
,
needle
,
thename
))
{
if
(
looking_at
==
selected
)
if
(
looking_at
==
selected
)
statusbar
(
_
(
"This is the only occurrence"
));
break
;
break
;
}
/* If we're back at the beginning and didn't find any match... */
...
...
This diff is collapsed.
Click to expand it.
src/color.c
View file @
cdcd365d
...
...
@@ -256,7 +256,7 @@ void color_update(void)
/* Now try and find a syntax that matches the magic string. */
if
(
magicstring
!=
NULL
)
{
for
(
sint
=
syntaxes
;
sint
!=
NULL
;
sint
=
sint
->
next
)
{
if
(
found_in_list
(
sint
->
magics
,
magicstring
))
if
(
found_in_list
(
sint
->
magics
,
magicstring
))
break
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/global.c
View file @
cdcd365d
...
...
@@ -964,9 +964,9 @@ void shortcut_init(void)
N_
(
"Go To Text"
),
IFSCHELP
(
nano_whereis_msg
),
BLANKAFTER
,
VIEW
);
#ifndef NANO_TINY
add_to_funcs
(
dos_format_void
,
MWRITEFILE
,
add_to_funcs
(
dos_format_void
,
MWRITEFILE
,
N_
(
"DOS Format"
),
IFSCHELP
(
nano_dos_msg
),
TOGETHER
,
NOVIEW
);
add_to_funcs
(
mac_format_void
,
MWRITEFILE
,
add_to_funcs
(
mac_format_void
,
MWRITEFILE
,
N_
(
"Mac Format"
),
IFSCHELP
(
nano_mac_msg
),
TOGETHER
,
NOVIEW
);
/* If we're using restricted mode, the Append, Prepend, and Backup toggles
...
...
This diff is collapsed.
Click to expand it.
src/rcfile.c
View file @
cdcd365d
...
...
@@ -728,7 +728,7 @@ void parse_colors(char *ptr, int rex_flags)
fgstr
=
++
ptr
;
ptr
=
parse_next_regex
(
ptr
);
if
(
ptr
==
NULL
)
break
;
break
;
/* If the start regex was invalid, skip past the end regex
* to stay in sync. */
...
...
@@ -889,10 +889,10 @@ static void check_vitals_mapped(void)
const
sc
*
s
=
first_sc_for
(
inmenus
[
v
],
f
->
scfunc
);
if
(
!
s
)
{
fprintf
(
stderr
,
_
(
"Fatal error: no keys mapped for function "
"
\"
%s
\"
. Exiting.
\n
"
),
f
->
desc
);
"
\"
%s
\"
. Exiting.
\n
"
),
f
->
desc
);
fprintf
(
stderr
,
_
(
"If needed, use nano with the -I option "
"to adjust your nanorc settings.
\n
"
));
exit
(
1
);
"to adjust your nanorc settings.
\n
"
));
exit
(
1
);
}
break
;
}
...
...
@@ -1046,9 +1046,9 @@ void parse_rcfile(FILE *rcstream
#endif
/* First handle unsetting. */
if
(
set
==
-
1
)
{
if
(
rcopts
[
i
].
flag
!=
0
)
if
(
rcopts
[
i
].
flag
!=
0
)
UNSET
(
rcopts
[
i
].
flag
);
else
else
rcfile_error
(
N_
(
"Cannot unset option
\"
%s
\"
"
),
rcopts
[
i
].
name
);
continue
;
}
...
...
This diff is collapsed.
Click to expand it.
src/text.c
View file @
cdcd365d
...
...
@@ -2187,9 +2187,9 @@ void do_justify(bool full_justify)
#endif
/* Break the current line. */
if
(
ISSET
(
JUSTIFY_TRIM
))
{
while
(
break_pos
>
0
&&
is_blank_mbchar
(
&
openfile
->
current
->
data
[
break_pos
-
1
]))
{
if
(
ISSET
(
JUSTIFY_TRIM
))
{
while
(
break_pos
>
0
&&
is_blank_mbchar
(
&
openfile
->
current
->
data
[
break_pos
-
1
]))
{
break_pos
--
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/winio.c
View file @
cdcd365d
...
...
@@ -1306,7 +1306,7 @@ int get_control_kbinput(int kbinput)
{
int
retval
;
/* Ctrl-Space (Ctrl-2, Ctrl-@, Ctrl-`) */
/* Ctrl-Space (Ctrl-2, Ctrl-@, Ctrl-`) */
if
(
kbinput
==
' '
||
kbinput
==
'2'
)
retval
=
NANO_CONTROL_SPACE
;
/* Ctrl-/ (Ctrl-7, Ctrl-_) */
...
...
@@ -1633,7 +1633,7 @@ const sc *get_shortcut(int *kbinput)
&&
meta_key
==
(
s
->
type
==
META
))
{
#ifdef DEBUG
fprintf
(
stderr
,
"matched seq
\"
%s
\"
, and btw meta was %d (menu is %x from %x)
\n
"
,
s
->
keystr
,
meta_key
,
currmenu
,
s
->
menus
);
s
->
keystr
,
meta_key
,
currmenu
,
s
->
menus
);
#endif
return
s
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help