summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-09-20 18:48:04 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-09-20 18:48:04 +0000
commit15778b29521b2122a3d3513eb3c3eaa263578607 (patch)
tree66b9b08b6f59aff7c00bb485845cedcb2903031e
parent656f2a264c12d2f5c3e3ebb4c905454299838634 (diff)
META env var.
-rw-r--r--CHANGES3
-rw-r--r--Makefile7
-rw-r--r--NOTES4
-rw-r--r--command.c4
4 files changed, 12 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 47ca4f3c..90445950 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
20 September 2007
+* Specify meta via environment variable (META).
* Record last window and ^L key to switch to it. Largely from Maximilian Gass.
* Reset ignored signals in child after forkpty, makes ^C work.
* Wrap on next/previous. From Maximilian Gass.
@@ -26,5 +27,5 @@
(including mutt, emacs). No status bar yet and no key remapping or other
customisation.
-$Id: CHANGES,v 1.8 2007-09-20 18:03:23 nicm Exp $
+$Id: CHANGES,v 1.9 2007-09-20 18:48:04 nicm Exp $
diff --git a/Makefile b/Makefile
index 39d1f1e3..043aedb9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2007-07-25 23:13:18 nicm Exp $
+# $Id: Makefile,v 1.3 2007-09-20 18:48:04 nicm Exp $
.SUFFIXES: .c .o .y .h
.PHONY: clean
@@ -13,6 +13,9 @@ DATE!= date +%Y%m%d-%H%M
# This must be empty as OpenBSD includes it in default CFLAGS.
DEBUG=
+# Command prefix. This will go when we get a configuration file...
+META?= \002 # C-b
+
SRCS= tmux.c server.c buffer.c buffer-poll.c xmalloc.c xmalloc-debug.c \
input.c screen.c window.c session.c local.c log.c command.c
@@ -20,7 +23,7 @@ YACC= yacc -d
CC= cc
INCDIRS+= -I. -I- -I/usr/local/include
-CFLAGS+= -DBUILD="\"$(VERSION) ($(DATE))\""
+CFLAGS+= -DBUILD="\"$(VERSION) ($(DATE))\"" -DMETA="'${META}'"
.ifdef DEBUG
CFLAGS+= -g -ggdb -DDEBUG
LDFLAGS+= -Wl,-E
diff --git a/NOTES b/NOTES
index 41494daf..b8a70ebb 100644
--- a/NOTES
+++ b/NOTES
@@ -2,7 +2,9 @@
don't expect a lot of progress soon. Contributions welcome!
-- Nicholas <nicm@users.sf.net>
-Command prefix is C-b.
+Command prefix is C-b. This can be changed by building with, for example:
+
+ META=\\001 make
Commands: d detach
c create new terminal
diff --git a/command.c b/command.c
index 9ed4cabd..f87c3137 100644
--- a/command.c
+++ b/command.c
@@ -1,4 +1,4 @@
-/* $Id: command.c,v 1.4 2007-09-20 18:03:23 nicm Exp $ */
+/* $Id: command.c,v 1.5 2007-09-20 18:48:04 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,7 +20,7 @@
#include "tmux.h"
-int cmd_prefix = '\002'; /* C-b */
+int cmd_prefix = META;
int cmd_fn_select(struct buffer *, int);
int cmd_fn_create(struct buffer *, int);