From bf91bebc61f1efd2077170c4087ba4f65b7a7e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20K=C3=BChling?= <dvdkhlng@gmx.de>
Date: Sat, 26 Feb 2011 13:32:20 +0100
Subject: [PATCH] emacs: fix load-history problem by disabling gpm-mouse-mode
 by default remove previous, non-working workaround from site-start.el

---
 emacs/files/site-start.el                |  5 -----
 emacs/patches/010-fix-init-env.patch     |  6 +++---
 emacs/patches/020-disable-gpm-mode.patch | 13 +++++++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 emacs/patches/020-disable-gpm-mode.patch

diff --git a/emacs/files/site-start.el b/emacs/files/site-start.el
index e760ec8..c020cef 100644
--- a/emacs/files/site-start.el
+++ b/emacs/files/site-start.el
@@ -20,8 +20,3 @@
 ;; or tmm-menubar
 (menu-bar-mode 0)
 
-;; ugly work-around for load-history entry (require . t-mouse) added by
-;; linux.el Not good, as it costs some memory.
-(setq load-history
-      (apply 'nconc (mapcar (lambda (v) (if (stringp (car v)) (list v) nil)) 
-			    load-history)))
diff --git a/emacs/patches/010-fix-init-env.patch b/emacs/patches/010-fix-init-env.patch
index a03a9c4..1c29bcb 100644
--- a/emacs/patches/010-fix-init-env.patch
+++ b/emacs/patches/010-fix-init-env.patch
@@ -1,7 +1,7 @@
-Index: emacs23.2-openwrt-q/src/emacs.c
+Index: emacs/src/emacs.c
 ===================================================================
---- emacs23.2-openwrt-q.orig/src/emacs.c	2010-12-18 20:24:35.000000000 +0100
-+++ emacs23.2-openwrt-q/src/emacs.c	2010-12-18 20:28:41.000000000 +0100
+--- emacs.orig/src/emacs.c	2010-12-18 20:37:40.000000000 +0100
++++ emacs/src/emacs.c	2010-12-18 20:37:40.000000000 +0100
 @@ -1735,6 +1735,10 @@
  #endif  /* HAVE_NTGUI */
      }
diff --git a/emacs/patches/020-disable-gpm-mode.patch b/emacs/patches/020-disable-gpm-mode.patch
new file mode 100644
index 0000000..82a152f
--- /dev/null
+++ b/emacs/patches/020-disable-gpm-mode.patch
@@ -0,0 +1,13 @@
+Index: emacs-23.2/lisp/t-mouse.el
+===================================================================
+--- emacs-23.2.orig/lisp/t-mouse.el	2011-02-26 13:06:10.000000000 +0100
++++ emacs-23.2/lisp/t-mouse.el	2011-02-26 13:06:25.000000000 +0100
+@@ -73,7 +73,7 @@
+ This allows the use of the mouse when operating on a GNU/Linux console,
+ in the same way as you can use the mouse under X11.
+ It relies on the `gpm' daemon being activated."
+-  :global t :group 'mouse :init-value t
++  :global t :group 'mouse :init-value nil
+   (dolist (terminal (terminal-list))
+     (when (and (eq t (terminal-live-p terminal))
+                (not (eq gpm-mouse-mode