From 2732ce4a998797b1d2350c1ddbc71e1b3c4da62f Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Sun, 26 Mar 2006 22:16:06 +0000
Subject: [PATCH] fixed macintosh, F13-F15 b.fd.o#6399

---
 ChangeLog           | 6 ++++++
 keycodes/macintosh  | 9 +++++++++
 keymap/macintosh    | 4 ++--
 rules/base.m_k.part | 3 ++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 351b88d..238412d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-27  Sergey Udaltsov
+
+	keycodes/macintosh,keymap/macintosh,rules/base.m_k.part: fixed
+	Macintosh F13-F15, closed 
+	https://bugs.freedesktop.org/show_bug.cgi?id=6399
+
 2006-03-25  Sergey Udaltsov
 
 	symbols/inet: fixed cymotion,
diff --git a/keycodes/macintosh b/keycodes/macintosh
index 5ed575c..adc502b 100644
--- a/keycodes/macintosh
+++ b/keycodes/macintosh
@@ -29,6 +29,15 @@
 // $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.4 2001/10/02 19:57:00 alanh Exp $
 //
 default xkb_keycodes "macintosh" {
+   include "xfree86"
+
+   <FK13> = 182;
+   <FK14> = 183;
+   <FK15> = 184;
+   <KPEQ> = 157;
+   
+};
+xkb_keycodes "old" {
 
     minimum= 8;
     maximum= 134;
diff --git a/keymap/macintosh b/keymap/macintosh
index f3fb553..de115ba 100644
--- a/keymap/macintosh
+++ b/keymap/macintosh
@@ -1,7 +1,7 @@
 // $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $
 // $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.1 1999/05/23 05:27:51 dawes Exp $
 default xkb_keymap "macintosh" {
-    xkb_keycodes	{ include "xfree86"				};
+    xkb_keycodes	{ include "macintosh"				};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
@@ -9,7 +9,7 @@ default xkb_keymap "macintosh" {
 };
 
 xkb_keymap "macintosh_old" {
-    xkb_keycodes	{ include "macintosh"				};
+    xkb_keycodes	{ include "macintosh(old)"				};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index afdb3d0..9e120c8 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -2,7 +2,8 @@
   ataritt	=	ataritt(de)
   sun4		=	sun(type4_euro)
   sun5		=	sun(type5_euro)
-  macintosh_old	=	macintosh
+  macintosh_old	=	macintosh(old)
+  macintosh	=	macintosh
   powerpcps2	=	powerpcps2
   pc98		=	xfree98(pc98)
   abnt2		=	xfree86(abnt2)
-- 
2.32.0.93.g670b81a890