vis

commit 3d6cf2177f5c690910cf00b930633259a1008a0f
parent 302f7e1b19ed4c8b00045ce7d829f5eeeca0a7fc
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Wed, 18 May 2016 13:08:07 +0200

vis: add #define for VIS_MENU

Diffstat:
M
main.c
 | 
2
+-
M
register.c
 | 
4
----
M
vis-cmds.c
 | 
4
----
M
vis.h
 | 
11
+++++++++++

4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/main.c b/main.c
@@ -2140,7 +2140,7 @@ static const char *complete_word(Vis *vis, const char *keys, const Arg *arg) {
 	buffer_init(&cmd);
 	char *prefix = get_completion_prefix(vis);
 	if (prefix && buffer_printf(&cmd, "tr \" ;:$<>#?{}()[],.'\" '\n' | "
-	    " grep '^%s' | sort | uniq | vis-menu | tr -d '\n' | sed 's/%s//'", prefix, prefix)) {
+	    " grep '^%s' | sort | uniq | " VIS_MENU " | tr -d '\n' | sed 's/%s//'", prefix, prefix)) {
 		Filerange all = text_range_new(0, text_size(txt));
 		insert_dialog_selection(vis, &all, (const char*[]){ buffer_content0(&cmd), NULL });
 	}
diff --git a/register.c b/register.c
@@ -6,10 +6,6 @@
 #include "util.h"
 #include "register.h"
 
-#ifndef VIS_CLIPBOARD
-#define VIS_CLIPBOARD "vis-clipboard"
-#endif
-
 static ssize_t read_buffer(void *context, char *data, size_t len) {
 	buffer_append(context, data, len);
 	return len;
diff --git a/vis-cmds.c b/vis-cmds.c
@@ -3,10 +3,6 @@
 #include <termkey.h>
 #include "vis-lua.h"
 
-#ifndef VIS_OPEN
-#define VIS_OPEN "vis-open"
-#endif
-
 typedef struct {
 	CmdFunc func;
 	void *data;
diff --git a/vis.h b/vis.h
@@ -13,6 +13,17 @@ typedef struct Win Win;
 #include "view.h"
 #include "text-regex.h"
 
+/* simplify utility renames by distribution packagers */
+#ifndef VIS_MENU
+#define VIS_MENU "vis-menu"
+#endif
+#ifndef VIS_OPEN
+#define VIS_OPEN "vis-open"
+#endif
+#ifndef VIS_CLIPBOARD
+#define VIS_CLIPBOARD "vis-clipboard"
+#endif
+
 typedef struct {
 	void (*vis_init)(Vis*);
 	void (*vis_start)(Vis*);