User: stephent
Date: 05/09/08 08:56:18
Branch: xemacs/lisp sjt-xft
Modified: xemacs/lisp font.el ChangeLog.Xft
Log:
remove vestigial code <87br34xd8g.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.15.2.6 +1 -5 XEmacs/xemacs/lisp/font.el
Index: font.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font.el,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -p -r1.15.2.5 -r1.15.2.6
--- font.el 2005/07/13 04:44:39 1.15.2.5
+++ font.el 2005/09/08 06:56:16 1.15.2.6
@@ -637,11 +637,7 @@ The type may be the strings \"px\", \"pi
(or device (setq device (selected-device)))
(font-truename
(make-font-specifier
- (face-font-name 'default device)))
- (let ((font (cdr-safe (assq 'font (frame-parameters device)))))
- (if (and (fboundp 'fontsetp) (fontsetp font))
- (aref (get-font-info (aref (cdr (get-fontset-info font)) 0)) 2)
- font)))
+ (face-font-name 'default device))))
;;;###autoload
(defun font-default-object-for-device (&optional device)
1.1.2.4 +5 -0 XEmacs/xemacs/lisp/Attic/ChangeLog.Xft
Index: ChangeLog.Xft
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/Attic/ChangeLog.Xft,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- ChangeLog.Xft 2005/09/06 08:24:45 1.1.2.3
+++ ChangeLog.Xft 2005/09/08 06:56:17 1.1.2.4
@@ -1,3 +1,8 @@
+2005-09-07 Clemens Fruhwirth <clemens(a)endorphin.org>
+
+ * font.el (font-default-font-for-device): Remove vestigial code
+ from incomplete removal of conditional.
+
2005-08-17 Stephen J. Turnbull <stephen(a)xemacs.org>
* fontconfig.el (fc-try-font): Improve docstring, add todo comment.
Show replies by date