mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

(custom-face-attributes): Add post-filter function for :box.

Browse Source 
Make pre-filter function for :box handle all cases.
This commit is contained in:
Miles Bader 2000-11-28 06:41:19 +00:00
parent d970106bfb
commit 36b80a0dd4
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2000-11-28 Miles Bader <miles@gnu.org>
* cus-face.el (custom-face-attributes): Add post-filter function
for :box. Make pre-filter function for :box handle all cases.
* wid-edit.el (widget-choose): Make sure pop-up window is large
enough to display all the choices, as there's no way to scroll it.

36
lisp/cus-face.el
View File

@ -161,8 +161,7 @@
(const :tag "*" nil)
(const :tag "Off" off)
(list :tag "Box"
:value (:line-width 2 :color "grey75"
:style released-button)
:value (:line-width 2 :color "grey75" :style released-button)
(const :format "" :value :line-width)
(integer :tag "Width")
(const :format "" :value :color)
@ -174,11 +173,34 @@
(const :tag "None" nil))))
;; filter to make value suitable for customize
(lambda (real-value)
(if (consp real-value)
(list :line-width (or (plist-get real-value :line-width) 1)
:color (plist-get real-value :color)
:style (plist-get real-value :style))
real-value)))
(let ((lwidth
(or (and (consp real-value) (plist-get real-value :line-width))
(and (integerp real-value) real-value)
1))
(color
(or (and (consp real-value) (plist-get real-value :color))
(and (stringp real-value) real-value)
nil))
(style
(and (consp real-value) (plist-get real-value :line-width))))
(list :line-width lwidth :color color :style style)))
;; filter to make customized-value suitable for storing
(lambda (cus-value)
(if (consp cus-value)
(let ((lwidth (plist-get cus-value :line-width))
(color (plist-get cus-value :color))
(style (plist-get cus-value :style)))
(cond ((and (null color) (null style))
lwidth)
((and (null lwidth) (null style))
;; actually can't happen, because LWIDTH is always an int
color)
(t
;; Keep as a plist, but remove null entries
(nconc (and lwidth `(:line-width ,lwidth))
(and color `(:color ,color))
(and style `(:style ,style))))))
cus-value)))
(:inverse-video
(choice :tag "Inverse-video"