Fix updating of menus with GTK+ 2.18, bug 292007.

(Portage version: 2.2_rc49/cvs/Linux i686)

2 files changed, 0 insertions, 70 deletions

diff --git a/app-editors/emacs/files/emacs-23.0.94-handle-xz-suffix.patch b/app-editors/emacs/files/emacs-23.0.94-handle-xz-suffix.patch
deleted file mode 100644
index 9345ceaabbd4..000000000000
--- a/app-editors/emacs/files/emacs-23.0.94-handle-xz-suffix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Automatically handle .xz suffix (XZ-compressed files)
-From Jim Meyering <meyering@redhat.com> on emacs-devel
-
---- a/lisp/jka-cmpr-hook.el
-+++ b/lisp/jka-cmpr-hook.el
-@@ -219,6 +219,10 @@ options through Custom does this automatically."
-      "compressing"        "gzip"         ("-c" "-q")
-      "uncompressing"      "gzip"         ("-c" "-q" "-d")
-      t t "\037\213"]
-+    ["\\.xz\\(~\\|\\.~[0-9]+~\\)?\\'"
-+     "XZ compressing"     "xz"           ("-c" "-q")
-+     "XZ uncompressing"   "xz"           ("-c" "-q" "-d")
-+     t t "\3757zXZ\0"]
-     ;; dzip is gzip with random access.  Its compression program can't
-     ;; read/write stdin/out, so .dz files can only be viewed without
-     ;; saving, having their contents decompressed with gzip.
diff --git a/app-editors/emacs/files/emacs-23.1-backspace.patch b/app-editors/emacs/files/emacs-23.1-backspace.patch
deleted file mode 100644
index bc547af8a27b..000000000000
--- a/app-editors/emacs/files/emacs-23.1-backspace.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-2009-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-	* simple.el (normal-erase-is-backspace-mode): Use input-decode-map
-	rather than fiddling with global-map bindings, since it should only
-	affect per-terminal settings.
-	See http://bugs.gentoo.org/show_bug.cgi?id=289709.
-
---- emacs-23.1-orig/lisp/simple.el
-+++ emacs-23.1/lisp/simple.el
-@@ -6269,31 +6269,27 @@
- 	   (let* ((bindings
- 		   `(([M-delete] [M-backspace])
- 		     ([C-M-delete] [C-M-backspace])
--		     (,esc-map
--		      [C-delete] [C-backspace])))
-+		     ([?\e C-delete] [?\e C-backspace])))
- 		  (old-state (lookup-key local-function-key-map [delete])))
- 
- 	     (if enabled
- 		 (progn
- 		   (define-key local-function-key-map [delete] [?\C-d])
- 		   (define-key local-function-key-map [kp-delete] [?\C-d])
--		   (define-key local-function-key-map [backspace] [?\C-?]))
-+		   (define-key local-function-key-map [backspace] [?\C-?])
-+                   (dolist (b bindings)
-+                     ;; Not sure if input-decode-map is really right, but
-+                     ;; keyboard-translate-table (used below) only works
-+                     ;; for integer events, and key-translation-table is
-+                     ;; global (like the global-map, used earlier).
-+                     (define-key input-decode-map (car b) nil)
-+                     (define-key input-decode-map (cadr b) nil)))
- 	       (define-key local-function-key-map [delete] [?\C-?])
- 	       (define-key local-function-key-map [kp-delete] [?\C-?])
--	       (define-key local-function-key-map [backspace] [?\C-?]))
--
--	     ;; Maybe swap bindings of C-delete and C-backspace, etc.
--	     (unless (equal old-state (lookup-key local-function-key-map [delete]))
--	       (dolist (binding bindings)
--		 (let ((map global-map))
--		   (when (keymapp (car binding))
--		     (setq map (car binding) binding (cdr binding)))
--		   (let* ((key1 (nth 0 binding))
--			  (key2 (nth 1 binding))
--			  (binding1 (lookup-key map key1))
--			  (binding2 (lookup-key map key2)))
--		     (define-key map key1 binding2)
--		     (define-key map key2 binding1)))))))
-+	       (define-key local-function-key-map [backspace] [?\C-?])
-+               (dolist (b bindings)
-+                 (define-key input-decode-map (car b) (cadr b))
-+                 (define-key input-decode-map (cadr b) (car b))))))
- 	  (t
- 	   (if enabled
- 	       (progn