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

`height' regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24f0c7d6da638ceec73cc429bc04cdf7859e8caf..f297ef1798ad6020174c433d0108437d329aba58 100644 (file)
--- 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 8786ea95ad8984ba0ec38a288be2f2f771af5e17..8a7fca4834cc8e8e257382a8155faa1e6d50703c 100644 (file)
--- 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)