aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--Makefile4
-rw-r--r--TODO1
-rw-r--r--window-copy.c7
4 files changed, 13 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index b1beefdf..bd26873f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
11 January 2009
+* GCC screws up copying (window-copy.c) so build with -O0 until I have time to
+ find the problem or a better workaround.
* Vertical window splitting. Currently can only split a window into two panes.
New split-window command splits (bound to ") and switch-pane command (bound to
o) switches between panes.
@@ -65,7 +67,7 @@
07 January 2009
-* New flag to set and setw, -u, to unset a option (allowing it to inherit from)
+* New flag to set and setw, -u, to unset an option (allowing it to inherit from)
the global options again.
* Added more info messages for options changes.
* A bit of tidying and reorganisation of options code.
@@ -874,7 +876,7 @@
(including mutt, emacs). No status bar yet and no key remapping or other
customisation.
-$Id: CHANGES,v 1.193 2009-01-11 23:31:46 nicm Exp $
+$Id: CHANGES,v 1.194 2009-01-12 00:52:37 nicm Exp $
LocalWords: showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
LocalWords: rivo nurges lscm Erdely eol smysession mysession ek dstname RB
diff --git a/Makefile b/Makefile
index a403378f..207f6595 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.88 2009-01-11 23:31:46 nicm Exp $
+# $Id: Makefile,v 1.89 2009-01-12 00:52:37 nicm Exp $
.SUFFIXES: .c .o .y .h
.PHONY: clean update-index.html upload-index.html
@@ -44,7 +44,7 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \
CC?= cc
INCDIRS+= -I. -I- -I/usr/local/include
-CFLAGS+= -DMETA="'${META}'"
+CFLAGS+= -O0 -DMETA="'${META}'"
.ifdef PROFILE
# Don't use ccache
CC= /usr/bin/gcc
diff --git a/TODO b/TODO
index e7bc7497..ccb97a42 100644
--- a/TODO
+++ b/TODO
@@ -100,3 +100,4 @@
bind m command-prompt 'split "man %%"'
bind r command-prompt 'renamew "%%"'
which then asks for a string, substitutes %% in command and executes it
+- fix rxvt cursor fg issue (text under cursor has non-white fg)
diff --git a/window-copy.c b/window-copy.c
index bdafbce2..89b909ab 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1,4 +1,4 @@
-/* $Id: window-copy.c,v 1.38 2009-01-11 23:31:46 nicm Exp $ */
+/* $Id: window-copy.c,v 1.39 2009-01-12 00:52:37 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -401,6 +401,11 @@ window_copy_copy_selection(struct window_pane *wp, struct client *c)
xx = window_copy_find_length(wp, sy);
window_copy_copy_line(wp, &buf, &off, sy, sx, xx);
if (ey - sy > 1) {
+ /*
+ * XXX gcc -O2 completely screws this up and either
+ * causes a segfault or exits the loop after one
+ * iteration.
+ */
for (i = sy + 1; i < ey - 1; i++) {
xx = window_copy_find_length(wp, i);
window_copy_copy_line(wp, &buf, &off, i, 0, xx);