diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-04-10 07:14:29 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-04-10 07:14:29 +0000 |
| commit | febc7bb2444ce9612ece85dffa8d853915b6de71 (patch) | |
| tree | 1d594d5a6f83c5adf07d944c712e58b9868b587f | |
| parent | Add patchset for emacs-21.4 (diff) | |
| download | emacs-patches-febc7bb2444ce9612ece85dffa8d853915b6de71.tar.gz emacs-patches-febc7bb2444ce9612ece85dffa8d853915b6de71.tar.bz2 emacs-patches-febc7bb2444ce9612ece85dffa8d853915b6de71.zip | |
Put different patches in separate files.emacs-18.59-patches-1
| -rw-r--r-- | emacs/18.59/03_all_gcc4.patch | 17 | ||||
| -rw-r--r-- | emacs/18.59/04_all_backspace.patch | 26 |
2 files changed, 28 insertions, 15 deletions
diff --git a/emacs/18.59/03_all_gcc4.patch b/emacs/18.59/03_all_gcc4.patch index ce04f39..fd6d979 100644 --- a/emacs/18.59/03_all_gcc4.patch +++ b/emacs/18.59/03_all_gcc4.patch @@ -2,11 +2,9 @@ Prereq: 2004-03-09 diff -ur emacs-18.59-orig/src/ChangeLog emacs-18.59/src/ChangeLog --- emacs-18.59-orig/src/ChangeLog 2004-03-09 08:36:49.000000000 +0100 +++ emacs-18.59/src/ChangeLog 2007-01-29 21:47:56.000000000 +0100 -@@ -1,3 +1,11 @@ +@@ -1,3 +1,9 @@ +2007-01-29 Ulrich Mueller <ulm@kph.uni-mainz.de> + -+ * x11term.c (internal_socket_read): Handle XK_BackSpace key. -+ + * callproc.c, doprnt.c, emacssignal.h, fns.c, lisp.h, lread.c, + malloc.c, process.c, s-linux.h, sysdep.c, terminfo.c, x11term.c: + Fix GCC 4.1 compilation issues. @@ -525,18 +523,7 @@ diff -ur emacs-18.59-orig/src/x11term.c emacs-18.59/src/x11term.c @@ -33,1 +33,1 @@ -#endif lint +#endif -@@ -1482,6 +1482,10 @@ - strcpy(mapping_buf,"\016"); - nbytes = 1; - break; -+ case XK_BackSpace: -+ strcpy(mapping_buf,"\177"); -+ nbytes = 1; -+ break; - } - #ifndef AIX - } -@@ -1715,7 +1719,6 @@ +@@ -1715,7 +1715,6 @@ extern char *getenv (); extern XTinterrupt_signal (); diff --git a/emacs/18.59/04_all_backspace.patch b/emacs/18.59/04_all_backspace.patch new file mode 100644 index 0000000..7ceda1e --- /dev/null +++ b/emacs/18.59/04_all_backspace.patch @@ -0,0 +1,26 @@ +Prereq: 2007-01-29 +diff -ur emacs-18.59-orig/src/ChangeLog emacs-18.59/src/ChangeLog +--- emacs-18.59-orig/src/ChangeLog 2007-01-29 21:47:56.000000000 +0100 ++++ emacs-18.59/src/ChangeLog 2007-01-30 01:00:00.000000000 +0100 +@@ -1,3 +1,7 @@ ++2007-01-30 Ulrich Mueller <ulm@kph.uni-mainz.de> ++ ++ * x11term.c (internal_socket_read): Handle XK_BackSpace key. ++ + 2007-01-29 Ulrich Mueller <ulm@kph.uni-mainz.de> + + * callproc.c, doprnt.c, emacssignal.h, fns.c, lisp.h, lread.c, +diff -ur emacs-18.59-orig/src/x11term.c emacs-18.59/src/x11term.c +--- emacs-18.59-orig/src/x11term.c 2007-01-29 21:47:56.000000000 +0100 ++++ emacs-18.59/src/x11term.c 2007-01-30 01:00:00.000000000 +0100 +@@ -1482,6 +1482,10 @@ + strcpy(mapping_buf,"\016"); + nbytes = 1; + break; ++ case XK_BackSpace: ++ strcpy(mapping_buf,"\177"); ++ nbytes = 1; ++ break; + } + #ifndef AIX + } |