# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1206598279 0
# Node ID 177806bc3b1bf8da6c7a99c606c49fd2a3ec74e4
# Parent  c3bda68eeaa42a72e900e64e8c9fe645eed8e411
(diary-face-attrs): Revert previous change to `weight' type.  Fix
`height' regexp.

diff -r c3bda68eeaa4 -r 177806bc3b1b lisp/calendar/diary-lib.el
--- a/lisp/calendar/diary-lib.el	Thu Mar 27 03:40:36 2008 +0000
+++ b/lisp/calendar/diary-lib.el	Thu Mar 27 06:11:19 2008 +0000
@@ -84,8 +84,8 @@
 (defcustom diary-face-attrs
   '((" *\\[foreground:\\([-a-z]+\\)\\]$" 1 :foreground string)
     (" *\\[background:\\([-a-z]+\\)\\]$" 1 :background string)
-    (" *\\[width:\\([-a-z]+\\)\\]$" 1 :width int)
-    (" *\\[height:\\([-0-9a-z]+\\)\\]$" 1 :height int)
+    (" *\\[width:\\([-a-z]+\\)\\]$" 1 :width symbol)
+    (" *\\[height:\\([.0-9]+\\)\\]$" 1 :height int)
     (" *\\[weight:\\([-a-z]+\\)\\]$" 1 :weight symbol)
     (" *\\[slant:\\([-a-z]+\\)\\]$" 1 :slant symbol)
     (" *\\[underline:\\([-a-z]+\\)\\]$" 1 :underline stringtnil)