Mercurial > hg > xemacs-beta
changeset 3125:d97bc868eaaf
[xemacs-hg @ 2005-12-05 09:43:36 by scop]
Look for rgb.txt from /usr(/local)/share/X11 <1133641210.2195.86.camel@localhost.localdomain>
| author | scop |
|---|---|
| date | Mon, 05 Dec 2005 09:43:37 +0000 |
| parents | e698963eb2fe |
| children | 54e0616b56c0 |
| files | lisp/ChangeLog lisp/font.el lisp/x-faces.el |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Dec 04 22:51:19 2005 +0000 +++ b/lisp/ChangeLog Mon Dec 05 09:43:37 2005 +0000 @@ -1,3 +1,8 @@ +2005-12-03 Ville Skyttä <scop@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@xemacs.org> * package-get.el (package-get-download-sites): Update reflecting
--- a/lisp/font.el Sun Dec 04 22:51:19 2005 +0000 +++ b/lisp/font.el Mon Dec 05 09:43:37 2005 +0000 @@ -1162,8 +1162,6 @@ 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 @@ "/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/"
--- a/lisp/x-faces.el Sun Dec 04 22:51:19 2005 +0000 +++ b/lisp/x-faces.el Mon Dec 05 09:43:37 2005 +0000 @@ -584,7 +584,9 @@ "/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/"