aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cmdline.cpp8
-rw-r--r--src/interface-curses.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cmdline.cpp b/src/cmdline.cpp
index 1a3447f..59dba59 100644
--- a/src/cmdline.cpp
+++ b/src/cmdline.cpp
@@ -554,15 +554,15 @@ Cmdline::fnmacro(const gchar *name)
FNMACRO_MASK_STRING = (1 << 1)
};
- if (!(Flags::ed & Flags::ED_FNKEYS))
- /* function key macros disabled */
- goto default_action;
-
gchar macro_name[1 + strlen(name) + 1];
QRegister *reg;
tecoInt mask;
gchar *macro;
+ if (!(Flags::ed & Flags::ED_FNKEYS))
+ /* function key macros disabled */
+ goto default_action;
+
macro_name[0] = CTL_KEY('F');
g_strlcpy(macro_name + 1, name, sizeof(macro_name) - 1);
diff --git a/src/interface-curses.h b/src/interface-curses.h
index 6116cae..e3bbbf5 100644
--- a/src/interface-curses.h
+++ b/src/interface-curses.h
@@ -96,7 +96,7 @@ typedef class InterfaceCurses : public Interface<InterfaceCurses, ViewCurses> {
*/
struct {
short r, g, b;
- } orig_color_table[G_N_ELEMENTS(color_table)];
+ } orig_color_table[16];
int stdout_orig, stderr_orig;
SCREEN *screen;