Fix /tag/*/index, again (thanks Suraj)

This commit is contained in:
Kris Maglione 2008-11-16 02:50:55 -05:00
parent 05597b0a36
commit 01c5643f9f
3 changed files with 8 additions and 4 deletions

View File

@ -225,7 +225,8 @@ find(Area **ap, Frame **fp, int dir, bool wrap, bool stack) {
*fp = stack_find(a, f, dir, stack);
if(*fp)
return true;
*ap = area_find(a->view, r, dir, wrap);
if (!a->floating)
*ap = area_find(a->view, r, dir, wrap);
if(!*ap)
return false;
*fp = stack_find(*ap, *fp, dir, stack);

View File

@ -364,6 +364,8 @@ view_attach(View *v, Frame *f) {
else if(starting || c->sel && c->sel->area && !c->sel->area->floating)
a = v->firstarea;
}
if(!a->floating && view_fullscreen_p(v, a->screen))
a = v->floating;
area_attach(a, f);
/* TODO: Decide whether to focus this frame */
@ -594,6 +596,7 @@ view_index(View *v) {
bufclear();
i = 0;
foreach_area(v, s, a) {
i++;
if(a->floating)
bufprint("# ~ %d %d\n", Dx(a->r), Dy(a->r));
else

View File

@ -1,7 +1,7 @@
VERS = hg$$(hg identify -n)
VERS = hg$$(hg log -r $$(hg id | awk -F'[+ ]' '{print $$1}') --template '{rev}')
VERS = hg$$(hg log -r $$(hg id 2>/dev/null | awk -F'[+ ]' '{print $$1}') --template '{rev}' 2>/dev/null)
VERSION = $(VERS)
VERSION := $(shell echo $(VERS) 2>/dev/null)
VERSION != echo $(VERS) 2>/dev/null
VERSION := $(shell echo $(VERS))
VERSION != echo $(VERS)
CONFVERSION = hg