Skip to content
GitLab
Menu
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
b77b1391
Commit
b77b1391
authored
8 years ago
by
Benno Schulenberg
Browse files
Options
Download
Email Patches
Plain Diff
tweaks: improve some indentation and reshuffle a few lines
parent
7e0c4e57
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/browser.c
+4
-4
src/browser.c
src/files.c
+10
-10
src/files.c
src/prompt.c
+2
-2
src/prompt.c
src/search.c
+20
-20
src/search.c
with
36 additions
and
36 deletions
+36
-36
src/browser.c
View file @
b77b1391
...
...
@@ -681,13 +681,13 @@ int filesearch_init(void)
/* This is now one simple call. It just does a lot. */
input
=
do_prompt
(
FALSE
,
#ifndef DISABLE_TABCOMP
TRUE
,
TRUE
,
#endif
MWHEREISFILE
,
NULL
,
MWHEREISFILE
,
NULL
,
#ifndef DISABLE_HISTORIES
&
search_history
,
&
search_history
,
#endif
browser_refresh
,
"%s%s"
,
_
(
"Search"
),
buf
);
browser_refresh
,
"%s%s"
,
_
(
"Search"
),
buf
);
/* Release buf now that we don't need it anymore. */
free
(
buf
);
...
...
This diff is collapsed.
Click to expand it.
src/files.c
View file @
b77b1391
...
...
@@ -1085,21 +1085,21 @@ void do_insertfile(
while
(
TRUE
)
{
#ifndef NANO_TINY
if
(
execute
)
{
msg
=
#ifndef DISABLE_MULTIBUFFER
ISSET
(
MULTIBUFFER
)
?
_
(
"Command to execute in new buffer [from %s] "
)
:
if
(
ISSET
(
MULTIBUFFER
))
msg
=
_
(
"Command to execute in new buffer [from %s] "
);
else
#endif
_
(
"Command to execute [from %s] "
);
msg
=
_
(
"Command to execute [from %s] "
);
}
else
#endif
/* NANO_TINY */
{
msg
=
#ifndef DISABLE_MULTIBUFFER
ISSET
(
MULTIBUFFER
)
?
_
(
"File to insert into new buffer [from %s] "
)
:
if
(
ISSET
(
MULTIBUFFER
))
msg
=
_
(
"File to insert into new buffer [from %s] "
);
else
#endif
_
(
"File to insert [from %s] "
);
msg
=
_
(
"File to insert [from %s] "
);
}
present_path
=
mallocstrcpy
(
present_path
,
"./"
);
...
...
@@ -1117,8 +1117,8 @@ void do_insertfile(
#endif
edit_refresh
,
msg
,
#ifndef DISABLE_OPERATINGDIR
operating_dir
!=
NULL
&&
strcmp
(
operating_dir
,
"."
)
!=
0
?
operating_dir
:
operating_dir
!=
NULL
&&
strcmp
(
operating_dir
,
"."
)
!=
0
?
operating_dir
:
#endif
"./"
);
...
...
This diff is collapsed.
Click to expand it.
src/prompt.c
View file @
b77b1391
...
...
@@ -546,7 +546,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
}
#ifdef DEBUG
fprintf
(
stderr
,
"acquir
e_an_answer
: answer =
\"
%s
\"
, statusbar_x = %lu
\n
"
,
answer
,
(
unsigned
long
)
statusbar_x
);
fprintf
(
stderr
,
"acquir
ing
: answer =
\"
%s
\"
, statusbar_x = %lu
\n
"
,
answer
,
(
unsigned
long
)
statusbar_x
);
#endif
update_the_statusbar
();
...
...
@@ -709,7 +709,7 @@ int do_prompt(bool allow_tabs,
{
va_list
ap
;
int
retval
=
KEY_WINCH
;
functionptrtype
func
;
functionptrtype
func
=
NULL
;
#ifndef DISABLE_TABCOMP
bool
listed
=
FALSE
;
#endif
...
...
This diff is collapsed.
Click to expand it.
src/search.c
View file @
b77b1391
...
...
@@ -155,32 +155,32 @@ int search_init(bool replacing, bool use_answer)
/* This is now one simple call. It just does a lot. */
i
=
do_prompt
(
FALSE
,
#ifndef DISABLE_TABCOMP
TRUE
,
TRUE
,
#endif
replacing
?
MREPLACE
:
MWHEREIS
,
backupstring
,
replacing
?
MREPLACE
:
MWHEREIS
,
backupstring
,
#ifndef DISABLE_HISTORIES
&
search_history
,
&
search_history
,
#endif
/* TRANSLATORS: This is the main search prompt. */
edit_refresh
,
"%s%s%s%s%s%s"
,
_
(
"Search"
),
/* TRANSLATORS: This is the main search prompt. */
edit_refresh
,
"%s%s%s%s%s%s"
,
_
(
"Search"
),
#ifndef NANO_TINY
/* TRANSLATORS: The next three
strings are modifiers of
the search prompt. */
ISSET
(
CASE_SENSITIVE
)
?
_
(
" [Case Sensitive]"
)
:
/* TRANSLATORS: The next three
modify
the search prompt. */
ISSET
(
CASE_SENSITIVE
)
?
_
(
" [Case Sensitive]"
)
:
#endif
""
,
""
,
#ifdef HAVE_REGEX_H
ISSET
(
USE_REGEXP
)
?
_
(
" [Regexp]"
)
:
ISSET
(
USE_REGEXP
)
?
_
(
" [Regexp]"
)
:
#endif
""
,
""
,
#ifndef NANO_TINY
ISSET
(
BACKWARDS_SEARCH
)
?
_
(
" [Backwards]"
)
:
ISSET
(
BACKWARDS_SEARCH
)
?
_
(
" [Backwards]"
)
:
#endif
""
,
replacing
?
""
,
replacing
?
#ifndef NANO_TINY
/* TRANSLATORS: The next two
strings are modifiers of
the search prompt. */
openfile
->
mark_set
?
_
(
" (to replace) in selection"
)
:
/* TRANSLATORS: The next two
modify
the search prompt. */
openfile
->
mark_set
?
_
(
" (to replace) in selection"
)
:
#endif
_
(
" (to replace)"
)
:
""
,
buf
);
_
(
" (to replace)"
)
:
""
,
buf
);
/* Release buf now that we don't need it anymore. */
free
(
buf
);
...
...
@@ -834,14 +834,14 @@ void do_replace(void)
i
=
do_prompt
(
FALSE
,
#ifndef DISABLE_TABCOMP
TRUE
,
TRUE
,
#endif
MREPLACEWITH
,
NULL
,
MREPLACEWITH
,
NULL
,
#ifndef DISABLE_HISTORIES
&
replace_history
,
&
replace_history
,
#endif
/* TRANSLATORS: This is a prompt. */
edit_refresh
,
_
(
"Replace with"
));
/* TRANSLATORS: This is a prompt. */
edit_refresh
,
_
(
"Replace with"
));
#ifndef DISABLE_HISTORIES
/* If the replace string is not "", add it to the replace history list. */
...
...
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