User: scop
Date: 05/12/05 10:43:39
Modified: xemacs/lisp ChangeLog font.el x-faces.el
Log:
Look for rgb.txt from /usr(/local)/share/X11
<1133641210.2195.86.camel(a)localhost.localdomain>
Revision Changes Path
1.707 +5 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -p -r1.706 -r1.707
--- ChangeLog 2005/11/29 21:00:29 1.706
+++ ChangeLog 2005/12/05 09:43:36 1.707
@@ -1,3 +1,8 @@
+2005-12-03 Ville Skyttä <scop(a)xemacs.org>
+
+ * x-faces.el (x-library-search-path): Add /usr(/local)/share/X11.
+ * font.el (font-lookup-rgb-components): Ditto, remove stale comment.
+
2005-10-28 Adrian Aichner <adrian(a)xemacs.org>
* package-get.el (package-get-download-sites): Update reflecting
1.19 +2 -2 XEmacs/xemacs/lisp/font.el
Index: font.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- font.el 2005/11/26 11:45:54 1.18
+++ font.el 2005/12/05 09:43:37 1.19
@@ -1162,8 +1162,6 @@ for use in the 'weight' field of an mswi
The list (R G B) is returned, or an error is signaled if the lookup fails."
(let ((lib-list (if-boundp 'x-library-search-path
x-library-search-path
- ;; This default is from XEmacs 19.13 - hope it covers
- ;; everyone.
(list "/usr/X11R6/lib/X11/"
"/usr/X11R5/lib/X11/"
"/usr/lib/X11R6/X11/"
@@ -1174,7 +1172,9 @@ The list (R G B) is returned, or an erro
"/usr/local/lib/X11R5/X11/"
"/usr/X11/lib/X11/"
"/usr/lib/X11/"
+ "/usr/share/X11/"
"/usr/local/lib/X11/"
+ "/usr/local/share/X11/"
"/usr/X386/lib/X11/"
"/usr/x386/lib/X11/"
"/usr/XFree86/lib/X11/"
1.23 +2 -0 XEmacs/xemacs/lisp/x-faces.el
Index: x-faces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-faces.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- x-faces.el 2005/11/26 11:45:54 1.22
+++ x-faces.el 2005/12/05 09:43:37 1.23
@@ -584,7 +584,9 @@ Otherwise, it returns the next larger ve
"/usr/local/lib/X11R5/X11/"
"/usr/X11/lib/X11/"
"/usr/lib/X11/"
+ "/usr/share/X11/"
"/usr/local/lib/X11/"
+ "/usr/local/share/X11/"
"/usr/X386/lib/X11/"
"/usr/x386/lib/X11/"
"/usr/XFree86/lib/X11/"