6 files changed, 0 insertions, 123 deletions
diff --git a/editors/emacs23/files/patch-ChangeLog b/editors/emacs23/files/patch-ChangeLog
deleted file mode 100644
index 4fc2beae5610..000000000000
--- a/editors/emacs23/files/patch-ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
---- ChangeLog.orig	2009-07-29 18:10:35.000000000 +0300
-+++ ChangeLog	2010-01-23 11:35:20.591761496 +0200
-@@ -1,3 +1,8 @@
-+2010-01-18  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
-+
-+	* configure.in: Check for utmp.h availability, since some
-+	systems don't have one (e.g. FreeBSD 9.X and later versions).
-+
- 2009-07-29  Chong Yidong  <cyd@stupidchicken.com>
- 
- 	* Version 23.1 released.
diff --git a/editors/emacs23/files/patch-configure.in b/editors/emacs23/files/patch-configure.in
deleted file mode 100644
index 14cb6ddd95fc..000000000000
--- a/editors/emacs23/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2009-07-29 18:09:49.000000000 +0300
-+++ configure.in	2010-01-23 11:34:48.296987092 +0200
-@@ -1014,7 +1014,7 @@
-   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
-   termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
-   sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
--  sys/utsname.h pwd.h)
-+  sys/utsname.h pwd.h utmp.h)
- 
- AC_MSG_CHECKING(if personality LINUX32 can be set)
- AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
diff --git a/editors/emacs23/files/patch-src-ChangeLog b/editors/emacs23/files/patch-src-ChangeLog
deleted file mode 100644
index 3aa0d6117851..000000000000
--- a/editors/emacs23/files/patch-src-ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ChangeLog.orig	2009-07-29 19:55:12.000000000 +0300
-+++ src/ChangeLog	2010-01-23 11:35:44.446334596 +0200
-@@ -1,3 +1,9 @@
-+2010-01-18  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
-+
-+	* filelock.c: Include utmp.h only when HAVE_UTMP_H is true,
-+	since some systems don't have one (e.g. FreeBSD 9.X and later
-+	versions).
-+
- 2009-07-29  Chong Yidong  <cyd@stupidchicken.com>
- 
- 	* Version 23.1 released.
diff --git a/editors/emacs23/files/patch-src-filelock.c b/editors/emacs23/files/patch-src-filelock.c
deleted file mode 100644
index 7f8b0d0d4b59..000000000000
--- a/editors/emacs23/files/patch-src-filelock.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/filelock.c.orig	2009-06-21 07:38:14.000000000 +0300
-+++ src/filelock.c	2010-01-23 11:34:48.414989942 +0200
-@@ -62,7 +62,9 @@
- 
- #ifdef CLASH_DETECTION
- 
-+#ifdef HAVE_UTMP_H
- #include <utmp.h>
-+#endif
- 
- #if !defined (S_ISLNK) && defined (S_IFLNK)
- #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
diff --git a/editors/emacs23/files/patch-src-image.c b/editors/emacs23/files/patch-src-image.c
deleted file mode 100644
index 408d00ba8095..000000000000
--- a/editors/emacs23/files/patch-src-image.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/image.c.orig	2010-03-29 08:46:39.902587060 +0200
-+++ src/image.c	2010-03-29 08:51:40.907908128 +0200
-@@ -5793,7 +5793,7 @@
- /* PNG library details.  */
- 
- DEF_IMGLIB_FN (png_get_io_ptr);
--DEF_IMGLIB_FN (png_check_sig);
-+DEF_IMGLIB_FN (png_sig_cmp);
- DEF_IMGLIB_FN (png_create_read_struct);
- DEF_IMGLIB_FN (png_create_info_struct);
- DEF_IMGLIB_FN (png_destroy_read_struct);
-@@ -5824,7 +5824,7 @@
-     return 0;
- 
-   LOAD_IMGLIB_FN (library, png_get_io_ptr);
--  LOAD_IMGLIB_FN (library, png_check_sig);
-+  LOAD_IMGLIB_FN (library, png_sig_cmp);
-   LOAD_IMGLIB_FN (library, png_create_read_struct);
-   LOAD_IMGLIB_FN (library, png_create_info_struct);
-   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
-@@ -5849,7 +5849,7 @@
- #else
- 
- #define fn_png_get_io_ptr		png_get_io_ptr
--#define fn_png_check_sig		png_check_sig
-+#define fn_png_sig_cmp			png_sig_cmp
- #define fn_png_create_read_struct	png_create_read_struct
- #define fn_png_create_info_struct	png_create_info_struct
- #define fn_png_destroy_read_struct	png_destroy_read_struct
-@@ -5996,7 +5996,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
--	  || !fn_png_check_sig (sig, sizeof sig))
-+	  || fn_png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -6013,7 +6013,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
--	  || !fn_png_check_sig (tbr.bytes, sizeof sig))
-+	  || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;
diff --git a/editors/emacs23/files/patch-src-xfns.c b/editors/emacs23/files/patch-src-xfns.c
deleted file mode 100644
index 16415d515a53..000000000000
--- a/editors/emacs23/files/patch-src-xfns.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/xfns.c.orig	2009-08-31 00:03:02.000000000 +0100
-+++ src/xfns.c	2009-08-31 00:21:39.000000000 +0100
-@@ -468,8 +468,10 @@
-       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
- 	continue;
-       x = f->output_data.x;
--      /* Match if the window is this frame's menubar.  */
- #ifdef USE_GTK
-+      /* Match if the window is this frame's window (button presses are no longer
-+         caught by the menubar) or a menu in the menubar.
-+       */
-       if (x->menubar_widget)
-         {
-           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-@@ -477,13 +479,14 @@
- 
-           BLOCK_INPUT;
-           if (gwdesc != 0
--              && (gwdesc == x->menubar_widget
-+              && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent (x->menubar_widget))
-                   || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
-             found = 1;
-           UNBLOCK_INPUT;
-           if (found) return f;
-         }
- #else
-+      /* Match if the window is in this frame's menubar */
-       if (x->menubar_widget
- 	  && lw_window_is_in_menubar (wdesc, x->menubar_widget))
- 	return f;