(diary-face-attrs): Revert previous change to `weight' type. Fix

`height' regexp.

2 files changed, 3 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24f0c7d6da6..f297ef1798a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,7 +9,7 @@
         * calendar/cal-hebrew.el (list-hebrew-diary-entries):
         * calendar/cal-islam.el (list-islamic-diary-entries): Doc fix.
 
-        * calendar/diary-lib.el (diary-face-attrs): Fix type of `width'.
+        * calendar/diary-lib.el (diary-face-attrs): Fix `height' regexp.
         (list-diary-entries-hook, mark-diary-entries-hook)
         (include-other-diary-files, mark-included-diary-files): Doc fixes.
         (diary-set-header): New function.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 8786ea95ad8..8a7fca4834c 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -84,8 +84,8 @@ are holidays."
 (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)