From a99d0eb341fdc615f841c726b7e0956cd2ddf8ad Mon Sep 17 00:00:00 2001 From: Jerry James Date: Nov 09 2009 17:14:39 +0000 Subject: Context of the ChangeLog hunk of the upstream TTY font patch needed to be adjusted a bit. Also adjust the line numbers of the no-expdyn-ia64 patch so that it applies silently. --- diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 0133bc6..6379255 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -20,7 +20,7 @@ case "$xehost_os" in --- xemacs-21.5.27/configure~ 2006-05-16 07:16:04.000000000 +0300 +++ xemacs-21.5.27/configure 2007-01-04 00:34:35.000000000 +0200 -@@ -21584,11 +21584,6 @@ +@@ -22928,11 +22928,6 @@ fi # End of if cc_produces_so = no diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch index b4fb526..cc36f25 100644 --- a/xemacs-21.5.29-tty-font-512623.patch +++ b/xemacs-21.5.29-tty-font-512623.patch @@ -16,9 +16,9 @@ diff -r 80d74fed5399 lisp/ChangeLog + (make-face-unitalic): + TTY mapper takes 2 args. + - 2009-11-09 Didier Verna + 2009-05-18 Stephen J. Turnbull - * minibuf.el (read-buffer): New optional argument 'exclude' for + * XEmacs 21.5.29 "garbanzo" is released. diff -r 80d74fed5399 lisp/faces.el --- a/lisp/faces.el Mon Nov 09 09:21:59 2009 -0700 +++ b/lisp/faces.el Mon Nov 09 09:39:16 2009 -0700