color-lab.el: Add coding cookie.

color-lab.el (float-pi): Use eval-and-compile.
dgnushack.el (dgnushack-compile): Exclude shr-color.el from being compiled for Emacsen having no `libxml-parse-html-region' support.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64b3945..69dc194 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * color-lab.el: Add coding cookie.
+       (float-pi): Use eval-and-compile.
+
+       * dgnushack.el (dgnushack-compile): Exclude shr-color.el from being
+       compiled for Emacsen having no `libxml-parse-html-region' support.
+
 2010-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-insert-color-overlay): Split stuff like

diff --git a/lisp/color-lab.el b/lisp/color-lab.el
index 16f711a..c5a953c 100644 (file)
--- a/lisp/color-lab.el
+++ b/lisp/color-lab.el
@@ -1,4 +1,4 @@
-;;; color-lab.el --- Color manipulation laboratory routines
+;;; color-lab.el --- Color manipulation laboratory routines -*- coding: utf-8; -*-
 
 ;; Copyright (C) 2010 Free Software Foundation, Inc.
 
@@ -27,8 +27,9 @@
 ;;; Code:
 
 ;; Emacs < 23.3
-(unless (boundp 'float-pi)
-  (defconst float-pi (* 4 (atan 1)) "The value of Pi (3.1415926...)."))
+(eval-and-compile
+  (unless (boundp 'float-pi)
+    (defconst float-pi (* 4 (atan 1)) "The value of Pi (3.1415926...).")))
 
 (defun rgb->hsv (red green blue)
   "Convert RED GREEN BLUE values to HSV representation.
@@ -243,3 +244,5 @@ Colors must be in CIE L*a*b* format."
                  (* Rt (/ ΔC′ (* Sc kC)) (/ ΔH′ (* Sh kH)))))))))
 
 (provide 'color-lab)
+
+;;; color-lab.el ends here

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 0a76b59..7274cb0 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -300,7 +300,7 @@ dgnushack-compile."
                 ;; lpath.el binds it.
                 (not (eq (symbol-function 'libxml-parse-html-region)
                          'ignore)))
-      (setq files (delete "shr.el" files)))
+      (setq files (delete "shr-color.el" (delete "shr.el" files))))
 
     (dolist (file files)
       (setq file (expand-file-name file srcdir))