diff --git a/GNUmakefile b/GNUmakefile index 58e39226..0f9f2e95 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.91 2009-04-30 21:17:06 nicm Exp $ +# $Id: GNUmakefile,v 1.92 2009-05-13 22:10:39 nicm Exp $ .PHONY: clean @@ -9,8 +9,6 @@ DATE= $(shell date +%Y%m%d-%H%M) FDEBUG= 1 -META?= \002 - SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ xmalloc.c xmalloc-debug.c input.c input-keys.c \ screen.c screen-write.c screen-redraw.c \ @@ -45,7 +43,7 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ CC?= gcc INCDIRS+= -I. -I- -CFLAGS+= -DBUILD="\"$(VERSION) ($(DATE))\"" -DMETA="'${META}'" +CFLAGS+= -DBUILD="\"$(VERSION) ($(DATE))\"" ifdef FDEBUG CFLAGS+= -g -ggdb -DDEBUG LDFLAGS+= -rdynamic diff --git a/Makefile b/Makefile index c7a025bb..1898e3c8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.130 2009-05-04 17:58:25 nicm Exp $ +# $Id: Makefile,v 1.131 2009-05-13 22:10:39 nicm Exp $ .SUFFIXES: .c .o .y .h .PHONY: clean update-index.html upload-index.html @@ -12,8 +12,6 @@ DATE!= date +%Y%m%d-%H%M FDEBUG= 1 -META?= \002 # C-b - SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ xmalloc.c xmalloc-debug.c input.c input-keys.c \ screen.c screen-write.c screen-redraw.c \ @@ -48,7 +46,6 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ CC?= c INCDIRS+= -I. -I- -I/usr/local/include -CFLAGS+= -DMETA="'${META}'" .ifdef PROFILE # Don't use ccache CC= /usr/bin/gcc diff --git a/key-bindings.c b/key-bindings.c index 65555884..320a1e08 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -1,4 +1,4 @@ -/* $Id: key-bindings.c,v 1.70 2009-05-04 17:58:27 nicm Exp $ */ +/* $Id: key-bindings.c,v 1.71 2009-05-13 22:10:39 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -118,7 +118,7 @@ key_bindings_init(void) { 'x', 0, &cmd_confirm_before_entry }, { '{', 0, &cmd_swap_pane_entry }, { '}', 0, &cmd_swap_pane_entry }, - { META, 0, &cmd_send_prefix_entry }, + { '\002', 0, &cmd_send_prefix_entry }, { KEYC_PPAGE, 0, &cmd_scroll_mode_entry }, { KEYC_ADDESC('n'), 0, &cmd_next_window_entry }, { KEYC_ADDESC('p'), 0, &cmd_previous_window_entry }, diff --git a/tmux.c b/tmux.c index f85aa492..74270496 100644 --- a/tmux.c +++ b/tmux.c @@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.114 2009-05-04 17:58:27 nicm Exp $ */ +/* $Id: tmux.c,v 1.115 2009-05-13 22:10:39 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -288,7 +288,7 @@ main(int argc, char **argv) options_set_number(&global_options, "message-bg", 3); options_set_number(&global_options, "message-fg", 0); options_set_number(&global_options, "message-attr", GRID_ATTR_REVERSE); - options_set_number(&global_options, "prefix", META); + options_set_number(&global_options, "prefix", '\002'); options_set_number(&global_options, "repeat-time", 500); options_set_number(&global_options, "set-titles", 1); options_set_number(&global_options, "lock-after-time", 0);