rpms/xemacs/F-12 xemacs-21.5.29-tty-font-512623.patch, 1.1, 1.2 xemacs.spec, 1.56, 1.57

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2485/F-12

Modified Files:
	xemacs-21.5.29-tty-font-512623.patch xemacs.spec 
Log Message:
* Mon Nov  9 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-8
- Move macros.xemacs to the -common subpackage (bz 533611).
- Updated TTY font patch from upstream.


xemacs-21.5.29-tty-font-512623.patch:
 ChangeLog |   14 ++++++++++++++
 faces.el  |   45 +++++++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 16 deletions(-)

Index: xemacs-21.5.29-tty-font-512623.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs-21.5.29-tty-font-512623.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-21.5.29-tty-font-512623.patch	29 Oct 2009 16:34:31 -0000	1.1
+++ xemacs-21.5.29-tty-font-512623.patch	9 Nov 2009 16:50:46 -0000	1.2
@@ -1,28 +1,133 @@
-diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c
---- xemacs-21.5.29.ORIG/src/objects.c	2009-05-18 08:51:09.000000000 -0600
-+++ xemacs-21.5.29/src/objects.c	2009-10-29 09:09:21.562935348 -0600
-@@ -892,6 +892,11 @@
-       instantiator = Ffont_instance_name (instantiator);
-     }
- 
-+#ifdef HAVE_TTY
-+  if (LISTP (instantiator))
-+    instantiator = build_string ("normal");
-+#endif
+diff -r 80d74fed5399 lisp/ChangeLog
+--- a/lisp/ChangeLog	Mon Nov 09 09:21:59 2009 -0700
++++ b/lisp/ChangeLog	Mon Nov 09 09:39:16 2009 -0700
+@@ -1,3 +1,17 @@
++2009-11-01  Stephen Turnbull  <stephen at xemacs.org>
++
++	* faces.el (Face-frob-property):
++	Give mapper for TTYs 2 args.
++	(make-face-family):
++	(make-face-size):
++	Generic mapper ignores TTYs and null devices.
++	(make-face-bold):
++	(make-face-italic):
++	(make-face-bold-italic):
++	(make-face-unbold):
++	(make-face-unitalic):
++	TTY mapper takes 2 args.
 +
-   if (STRINGP (instantiator))
-     {
- #ifdef MULE
-@@ -981,7 +986,11 @@
- static void
- font_validate (Lisp_Object instantiator)
- {
--  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator))
-+  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)
-+#ifdef HAVE_TTY
-+      || LISTP (instantiator)
-+#endif
-+      )
-     return;
-   if (VECTORP (instantiator))
-     {
+ 2009-11-09  Didier Verna  <didier at xemacs.org>
+ 
+ 	* minibuf.el (read-buffer): New optional argument 'exclude' for
+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
+@@ -933,10 +933,11 @@
+   ;; and EXACT-P are as in that call.  UNFROBBED-FACE and FROBBED-FACE are
+   ;; what we expect the original face and the result to look like,
+   ;; respectively.  TTY-PROPS is a list of face properties to frob in place
+-  ;; of `font' for TTY's.  FROB-MAPPING is either a plist mapping device
++  ;; of `font' for TTYs.  FROB-MAPPING is either a plist mapping device
+   ;; types to functions of two args (NAME DEVICE) that will frob the
+-  ;; instantiator as appropriate for the device type (this includes TTY's),
+-  ;; or a function to handle the mapping for all device types.
++  ;; instantiator to NAME as appropriate for DEVICE's type (this includes
++  ;; TTYs #### TTYs are not passed the device, just the symbol 'tty), or a
++  ;; function to handle the mapping for all device types.
+   ;; STANDARD-FACE-MAPPING is an alist of mappings of inheritance
+   ;; instantiators to be replaced with other inheritance instantiators, meant
+   ;; for e.g. converting [bold] into [bold-italic].
+@@ -1038,7 +1039,11 @@
+ 			       (t
+ 				(let ((value
+ 				       (if (eq devtype-spec 'tty)
+-					   (funcall mapper x)
++					   ;; #### not quite right but need
++					   ;; two args to match documentation
++					   ;; mostly we just ignore TTYs so
++					   ;; for now just pass the devtype
++					   (funcall mapper x 'tty)
+ 					 (funcall mapper x
+ 						  (derive-domain-from-locale
+ 						   locale devtype-spec
+@@ -1194,10 +1199,14 @@
+   (Face-frob-property face locale tags exact-p
+ 		      nil nil 'font nil
+ 		      `(lambda (f d)
+-			  ;; keep the dependency on font.el for now
+-			  (let ((fo (font-create-object f d)))
+-			    (set-font-family fo ,family)
+-			    (font-create-name fo d)))
++			 ;; keep the dependency on font.el for now
++			 ;; #### The filter on null d is a band-aid.
++			 ;; Frob-face-property should not be passing in
++			 ;; null devices.
++			 (unless (or (null d) (eq d 'tty))
++			   (let ((fo (font-create-object f d)))
++			     (set-font-family fo ,family)
++			     (font-create-name fo d))))
+ 		      nil))
+ 
+ ;; Style (ie, typographical face) frobbing
+@@ -1311,7 +1320,7 @@
+   (interactive (list (read-face-name "Make which face bold: ")))
+   (Face-frob-property face locale tags exact-p
+ 		      'default 'bold 'font '(highlight)
+-		      '(tty		(lambda (x) t)
++		      '(tty		(lambda (f d) t)
+ 			x		x-make-font-bold
+ 			gtk		gtk-make-font-bold
+ 			mswindows	mswindows-make-font-bold
+@@ -1330,7 +1339,7 @@
+   (interactive (list (read-face-name "Make which face italic: ")))
+   (Face-frob-property face locale tags exact-p
+ 		      'default 'italic 'font '(underline)
+-		      '(tty		(lambda (x) t)
++		      '(tty		(lambda (f d) t)
+ 			x		x-make-font-italic
+ 			gtk		gtk-make-font-italic
+ 			mswindows	mswindows-make-font-italic
+@@ -1349,7 +1358,7 @@
+   (interactive (list (read-face-name "Make which face bold-italic: ")))
+   (Face-frob-property face locale tags exact-p
+ 		      'default 'bold-italic 'font '(underline highlight)
+-		      '(tty		(lambda (x) t)
++		      '(tty		(lambda (f d) t)
+ 			x		x-make-font-bold-italic
+ 			gtk		gtk-make-font-bold-italic
+ 			mswindows	mswindows-make-font-bold-italic
+@@ -1369,7 +1378,7 @@
+   (interactive (list (read-face-name "Make which face non-bold: ")))
+   (Face-frob-property face locale tags exact-p
+ 		      'bold 'default 'font '(highlight)
+-		      '(tty		(lambda (x) nil)
++		      '(tty		(lambda (f d) nil)
+ 			x		x-make-font-unbold
+ 			gtk		gtk-make-font-unbold
+ 			mswindows	mswindows-make-font-unbold
+@@ -1388,7 +1397,7 @@
+   (interactive (list (read-face-name "Make which face non-italic: ")))
+   (Face-frob-property face locale tags exact-p
+ 		      'italic 'default 'font '(underline)
+-		      '(tty		(lambda (x) nil)
++		      '(tty		(lambda (f d) nil)
+ 			x		x-make-font-unitalic
+ 			gtk		gtk-make-font-unitalic
+ 			mswindows	mswindows-make-font-unitalic
+@@ -1410,9 +1419,13 @@
+ 		      nil nil 'font nil
+ 		      `(lambda (f d)
+ 			 ;; keep the dependency on font.el for now
+-			 (let ((fo (font-create-object f d)))
+-			   (set-font-size fo ,size)
+-			   (font-create-name fo d)))
++			 ;; #### The filter on null d is a band-aid.
++			 ;; Frob-face-property should not be passing in
++			 ;; null devices.
++			 (unless (or (null d) (eq d 'tty))
++			   (let ((fo (font-create-object f d)))
++			     (set-font-size fo ,size)
++			     (font-create-name fo d))))
+ 		      nil))
+ 
+ ;; Why do the following two functions lose so badly in so many


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- xemacs.spec	3 Nov 2009 16:59:51 -0000	1.56
+++ xemacs.spec	9 Nov 2009 16:50:46 -0000	1.57
@@ -22,7 +22,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        7%{?snap:.%{snap}}%{?dist}
+Release:        8%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -533,7 +533,6 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
 %{_mandir}/man1/gnudoit.1*
-%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs
 
 %if %{with nox}
 %files nox
@@ -563,6 +562,7 @@ fi
 %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/
 %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc
 %endif
+%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs
 %config(noreplace) %{_sysconfdir}/skel/.xemacs/
 %{_mandir}/man1/etags.xemacs.1*
 %{_mandir}/man1/gnuserv.1*
@@ -589,6 +589,10 @@ fi
 
 
 %changelog
+* Mon Nov  9 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-8
+- Move macros.xemacs to the -common subpackage (bz 533611).
+- Updated TTY font patch from upstream.
+
 * Tue Nov  3 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-7
 - Make the desktop file consistent with Emacs (bz 532296).