From 3eb80fdbed03338101fb3ac6d26f63ebd68f5d37 Mon Sep 17 00:00:00 2001
From: pedro <pedro@openbsd.org>
Date: Sun, 30 Jul 2006 18:45:21 +0000
Subject: [PATCH] Fix scrolling of short man pages, and bind F5 to the in-base
 vi by default, instead of some 'run-mailcap' tool we don't have.

---
 x11/ion/Makefile                          |  4 +--
 x11/ion/patches/patch-etc_cfg_ioncore_lua | 34 +++++++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/x11/ion/Makefile b/x11/ion/Makefile
index 17efee11f16..c8f1ff4d29a 100644
--- a/x11/ion/Makefile
+++ b/x11/ion/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.37 2006/07/30 04:30:55 pedro Exp $
+# $OpenBSD: Makefile,v 1.38 2006/07/30 18:45:21 pedro Exp $
 
 COMMENT=	"light, keyboard friendly window manager"
 
 V=		20060524
 DISTNAME=	ion-3ds-${V}
-PKGNAME=	ion-${V}
+PKGNAME=	ion-${V}p0
 CATEGORIES=	x11
 
 HOMEPAGE=	http://modeemi.cs.tut.fi/~tuomov/ion/
diff --git a/x11/ion/patches/patch-etc_cfg_ioncore_lua b/x11/ion/patches/patch-etc_cfg_ioncore_lua
index 5cdfc6fae92..35858d6227c 100644
--- a/x11/ion/patches/patch-etc_cfg_ioncore_lua
+++ b/x11/ion/patches/patch-etc_cfg_ioncore_lua
@@ -1,7 +1,7 @@
-$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.2 2006/03/26 16:07:40 pedro Exp $
---- etc/cfg_ioncore.lua.orig	Sun Mar 26 06:37:34 2006
-+++ etc/cfg_ioncore.lua	Sun Mar 26 13:01:30 2006
-@@ -57,8 +57,8 @@ defbindings("WScreen", {
+$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.3 2006/07/30 18:45:21 pedro Exp $
+--- etc/cfg_ioncore.lua.orig	Wed May 24 13:23:26 2006
++++ etc/cfg_ioncore.lua	Sun Jul 30 15:39:20 2006
+@@ -63,8 +63,8 @@ defbindings("WScreen", {
      kpress(META.."F9", "ioncore.create_ws(_)"),
      
      bdoc("Display the main menu."),
@@ -12,7 +12,29 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.2 2006/03/26 16:07:40 pedro Exp $
      mpress("Button3", "mod_menu.pmenu(_, _sub, 'mainmenu')"),
      
      bdoc("Display the window list menu."),
-@@ -266,12 +266,7 @@ defmenu("mainmenu", {
+@@ -111,10 +111,10 @@ defbindings("WMPlex.toplevel", {
+                 "_sub:WClientWin"),
+ 
+     bdoc("Query for manual page to be displayed."),
+-    kpress(ALTMETA.."F1", "mod_query.query_man(_, ':man')"),
++    kpress(ALTMETA.."F1", "mod_query.query_man(_, '::man')"),
+ 
+     bdoc("Show the Ion manual page."),
+-    kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
++    kpress(META.."F1", "ioncore.exec_on(_, '::man ion3')"),
+ 
+     bdoc("Run a terminal emulator."),
+     kpress(ALTMETA.."F2", "ioncore.exec_on(_, 'xterm')"),
+@@ -130,7 +130,7 @@ defbindings("WMPlex.toplevel", {
+ 
+     bdoc("Query for file to edit."),
+     kpress(ALTMETA.."F5", 
+-           "mod_query.query_editfile(_, 'run-mailcap --action=edit')"),
++           "mod_query.query_editfile(_, ':vi')"),
+ 
+     bdoc("Query for file to view."),
+     kpress(ALTMETA.."F6", 
+@@ -286,12 +286,7 @@ defmenu("mainmenu", {
  -- Application menu
  defmenu("appmenu", {
      menuentry("XTerm",          "ioncore.exec_on(_, 'xterm')"),
@@ -26,7 +48,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.2 2006/03/26 16:07:40 pedro Exp $
      menuentry("Run...",         "mod_query.query_exec(_)"),
  })
  
-@@ -296,4 +291,6 @@ defctxmenu("WFrame", "Frame", {
+@@ -316,4 +311,6 @@ defctxmenu("WFrame", "Frame", {
      menuentry("Clear tags",     "ioncore.clear_tags()"),
      menuentry("Window info",    "mod_query.show_clientwin(_, _sub)",
                                  "_sub:WClientWin"),