Silence some warnings.

lisp/woman.el (woman-non-underline-faces): Use `set-face-underline'.
lisp/calc/calc.el (math-format-date-cache): Declare.

3 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c3f4e51ffb..b1bd67fc47d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * woman.el (woman-non-underline-faces): Use `set-face-underline'.
+        * calc/calc.el (math-format-date-cache): Declare.
+
 2012-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         * calc/calc-forms.el (math-julian-date-beginning)
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 2d75e897d9b..aeca45ebf26 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -464,7 +464,9 @@ to be identified as that note."
   :type 'string
   :group 'calc)
 
-;; Dates that are built-in options for `calc-gregorian-switch' should be 
+(defvar math-format-date-cache) ; calc-forms.el
+
+;; Dates that are built-in options for `calc-gregorian-switch' should be
 ;; (YEAR MONTH DAY math-date-from-gregorian-dt(YEAR MONTH DAY)) for speed.
 (defcustom calc-gregorian-switch nil
   "The first day the Gregorian calendar is used by Calc's date forms.
@@ -500,8 +502,8 @@ the United States."
                  (const :tag "Sweden (1753 3 1)" (1753 3 1 639965))
                  (const :tag "Switzerland (Catholic) (1584 1 22)" (1584 1 22 578200))
                  (const :tag "Switzerland (Protestant) (1701 1 12)" (1701 1 12 620924))
-                 (list :tag "(YEAR MONTH DAY)" 
-                       (integer :tag "Year") 
+                 (list :tag "(YEAR MONTH DAY)"
+                       (integer :tag "Year")
                        (integer :tag "Month (integer)")
                        (integer :tag "Day")))
   :set (lambda (symbol value)
diff --git a/lisp/woman.el b/lisp/woman.el
index 193dcd99022..1410a8971ad 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2196,7 +2196,7 @@ To be called on original buffer and any .so insertions."
                  (face-underline-p face))
             (let ((face-no-ul (intern (concat face-name "-no-ul"))))
               (copy-face face face-no-ul)
-              (set-face-underline-p face-no-ul nil)))))))
+              (set-face-underline face-no-ul nil)))))))
 
 ;; Preprocessors
 ;; =============