From 7ad5afb935086d9b19c9d55a350520a78b6af1d4 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Sun, 17 Dec 2017 16:16:59 +0100
Subject: [PATCH] tweaks: remove some unneeded parentheses, and shorten two
function calls
---
src/global.c | 10 ++++------
src/winio.c | 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/global.c b/src/global.c
index 6a580899..38c110be 100644
--- a/src/global.c
+++ b/src/global.c
@@ -993,11 +993,9 @@ void shortcut_init(void)
#endif
#ifdef ENABLE_HISTORIES
- add_to_funcs(get_history_older_void,
- (MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE),
+ add_to_funcs(get_history_older_void, MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE,
N_("PrevHstory"), WITHORSANS(prevhistory_gist), TOGETHER, VIEW);
- add_to_funcs(get_history_newer_void,
- (MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE),
+ add_to_funcs(get_history_newer_void, MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE,
N_("NextHstory"), WITHORSANS(nexthistory_gist), BLANKAFTER, VIEW);
#endif
@@ -1055,9 +1053,9 @@ void shortcut_init(void)
add_to_funcs(do_page_down, MBROWSER,
nextpage_tag, WITHORSANS(nextpage_gist), TOGETHER, VIEW);
- add_to_funcs(do_first_file, (MBROWSER|MWHEREISFILE),
+ add_to_funcs(do_first_file, MBROWSER|MWHEREISFILE,
N_("First File"), WITHORSANS(firstfile_gist), TOGETHER, VIEW);
- add_to_funcs(do_last_file, (MBROWSER|MWHEREISFILE),
+ add_to_funcs(do_last_file, MBROWSER|MWHEREISFILE,
N_("Last File"), WITHORSANS(lastfile_gist), BLANKAFTER, VIEW);
#ifndef NANO_TINY
add_to_funcs(do_prev_word_void, MBROWSER,
diff --git a/src/winio.c b/src/winio.c
index 075557d5..7a10eee7 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -96,13 +96,13 @@ void run_macro(void)
size_t i;
if (recording) {
- statusline(HUSH, _("Cannot run macro while recording"));
+ statusbar(_("Cannot run macro while recording"));
snip_last_keystroke();
return;
}
if (macro_length == 0) {
- statusline(HUSH, _("Macro is empty"));
+ statusbar(_("Macro is empty"));
return;
}
--
GitLab