--- a/lisp/font.el	Tue Feb 22 22:56:02 2011 +0100
+++ b/lisp/font.el	Thu Mar 17 23:42:59 2011 +0100
@@ -426,7 +426,7 @@
   (cond
    ((null args)
     (error "Wrong number of arguments to font-combine-fonts"))
-   ((= (length args) 1)
+   ((eql (length args) 1)
     (car args))
    (t
     (let ((retval (font-combine-fonts-internal (nth 0 args) (nth 1 args))))
@@ -988,7 +988,7 @@
 ;;; ###autoload
 (defun font-set-face-font (&optional face font &rest args)
   (cond
-   ((and (vectorp font) (= (length font) 12))
+   ((and (vectorp font) (eql (length font) 12))
     (let ((font-name (font-create-name font)))
       (set-face-property face 'font-specification font)
       (cond
@@ -1175,28 +1175,28 @@
 	r g b str)
   (cond ((string-match "^#[0-9a-f]+$" color)
 	 (cond
-	  ((= (length color) 4)
+	  ((eql (length color) 4)
 	   (setq r (font-hex-string-to-number (substring color 1 2))
 		 g (font-hex-string-to-number (substring color 2 3))
 		 b (font-hex-string-to-number (substring color 3 4))
 		 r (* r 4096)
 		 g (* g 4096)
 		 b (* b 4096)))
-	  ((= (length color) 7)
+	  ((eql (length color) 7)
 	   (setq r (font-hex-string-to-number (substring color 1 3))
 		 g (font-hex-string-to-number (substring color 3 5))
 		 b (font-hex-string-to-number (substring color 5 7))
 		 r (* r 256)
 		 g (* g 256)
 		 b (* b 256)))
-	  ((= (length color) 10)
+	  ((eql (length color) 10)
 	   (setq r (font-hex-string-to-number (substring color 1 4))
 		 g (font-hex-string-to-number (substring color 4 7))
 		 b (font-hex-string-to-number (substring color 7 10))
 		 r (* r 16)
 		 g (* g 16)
 		 b (* b 16)))
-	  ((= (length color) 13)
+	  ((eql (length color) 13)
 	   (setq r (font-hex-string-to-number (substring color 1 5))
 		 g (font-hex-string-to-number (substring color 5 9))
 		 b (font-hex-string-to-number (substring color 9 13))))
@@ -1231,7 +1231,7 @@
 
 (defun font-rgb-color-p (obj)
   (or (and (vectorp obj)
-	   (= (length obj) 4)
+	   (eql (length obj) 4)
 	   (eq (aref obj 0) 'rgb))))
 
 (defun font-rgb-color-red (obj) (aref obj 1))
@@ -1255,11 +1255,11 @@
       (list (font-rgb-color-red color)
 	    (font-rgb-color-green color)
 	    (font-rgb-color-blue color)))
-     ((and (vectorp color) (= 3 (length color)))
+     ((and (vectorp color) (eql 3 (length color)))
       (list (aref color 0) (aref color 1) (aref color 2)))
-     ((and (listp color) (= 3 (length color)) (floatp (car color)))
+     ((and (listp color) (eql 3 (length color)) (floatp (car color)))
       (mapcar #'(lambda (x) (* x 65535)) color))
-     ((and (listp color) (= 3 (length color)))
+     ((and (listp color) (eql 3 (length color)))
       color)
      ((or (string-match "^#" color)
 	  (string-match "^rgb:" color))