[emacs-debian commit] Work around bug in Xorg which makes AltGr incorrectly recognized @ emacs-debian--main--21.4

[Jérôme Marant]

Revision: emacs-debian--main--21.4--patch-15
Archive: jerome at debian.org--2005
Creator: Jerome Marant <jerome at marant.org>
Date: dim aoû  7 19:13:27 CEST 2005
Standard-date: 2005-08-07 17:13:27 GMT
New-files: patches/.arch-ids/xorg-altgr-fix.dpatch.id
    patches/xorg-altgr-fix.dpatch
Modified-files: changelog patches/00list
New-patches: jerome at debian.org--2005/emacs-debian--main--21.4--patch-15
Summary: Work around bug in Xorg which makes AltGr incorrectly recognized
Keywords: 

* Work around bug in Xorg which makes AltGr incorrectly recognized.
  This patch has been backported from Emacs CVS trunk. [Jérôme Marant]
  - debian/patches/xorg-altgr-fix.dpatch: new file.
  - debian/00list: updated.
* looking for jerome at debian.org--2005/emacs-debian--main--21.4--patch-14 to compare with
* build pristine tree for jerome at debian.org--2005/emacs-debian--main--21.4--patch-14
* comparing to jerome at debian.org--2005/emacs-debian--main--21.4--patch-14: ..... done.

* modified files

--- orig/changelog
+++ mod/changelog
@@ -26,6 +26,11 @@
     (closes: #309930) [Jérôme Marant]
     - debian/menu.in: pass the `-i' option to the command launching Emacs
       under X11.
+  
+  * Work around bug in Xorg which makes AltGr incorrectly recognized.
+    This patch has been backported from Emacs CVS trunk. [Jérôme Marant]
+    - debian/patches/xorg-altgr-fix.dpatch: new file.
+    - debian/00list: updated.
 
  --
 


--- orig/patches/00list
+++ mod/patches/00list
@@ -23,5 +23,6 @@
 arch-amd64
 arch-ppc64
 multibyte-char-key-modifiers
+xorg-altgr-fix
 fix-x-vs-no-x-diffs
 autofiles



* added files

--- /dev/null
+++ mod/patches/.arch-ids/xorg-altgr-fix.dpatch.id
@@ -0,0 +1 @@
+Jerome Marant <jerome at marant.org> Sun Aug  7 19:11:43 2005 24736.0
--- /dev/null
+++ mod/patches/xorg-altgr-fix.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xorg-altgr-fix.dpatch by Jerome Marant <jerome at debian.org>
+##
+## DP: ** Include Xutil.h after keysym.h to work around bug
+## DP: in Xorg which makes AltGr incorrectly recognised.
+## DP: Status: appears to be incorporated upstream
+## DP: Provided by: Jerome Marant <mlang at debian.org>
+## DP: Date: Sun,  7 Aug 2005 19:08:21 +0200
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./src/xterm.h /tmp/dpep-work.K20gf1/emacs21-21.4a/src/xterm.h
+--- ./src/xterm.h	2002-02-22 11:41:44.000000000 +0100
++++ /tmp/dpep-work.K20gf1/emacs21-21.4a/src/xterm.h	2005-08-07 19:06:04.000000000 +0200
+@@ -21,8 +21,8 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/cursorfont.h>
+-#include <X11/Xutil.h>
+ #include <X11/keysym.h>
++#include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xresource.h>
+