diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-10-24 14:43:31 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-10-24 14:43:31 -0400 |
| commit | 9317e49920455cb4481bf728cc0dce381ec905a8 (patch) | |
| tree | 08a4be48e46fadfd08424e61a57e2610ad46f72e /lisp/frame.el | |
| parent | 59dd6f738c165a6808a924f0628764af70a898a1 (diff) | |
| download | emacs-9317e49920455cb4481bf728cc0dce381ec905a8.tar.gz | |
Merge read-color and facemenu-read-color (Bug#7242).
* lisp/facemenu.el (facemenu-read-color): Alias for read-color.
(facemenu-set-foreground, facemenu-set-background): Use
read-color.
* lisp/faces.el (read-color): Use the completion code from
facemenu-read-color. Require match in completion. Doc fix.
* lisp/frame.el (set-background-color, set-foreground-color)
(set-cursor-color, set-mouse-color, set-border-color): Use
read-color.
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 8210363610c..06e2268c697 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1067,7 +1067,7 @@ See `modify-frame-parameters'." "Set the background color of the selected frame to COLOR-NAME. When called interactively, prompt for the name of the color to use. To get the frame's current background color, use `frame-parameters'." - (interactive (list (facemenu-read-color "Background color: "))) + (interactive (list (read-color "Background color: "))) (modify-frame-parameters (selected-frame) (list (cons 'background-color color-name))) (or window-system @@ -1077,7 +1077,7 @@ To get the frame's current background color, use `frame-parameters'." "Set the foreground color of the selected frame to COLOR-NAME. When called interactively, prompt for the name of the color to use. To get the frame's current foreground color, use `frame-parameters'." - (interactive (list (facemenu-read-color "Foreground color: "))) + (interactive (list (read-color "Foreground color: "))) (modify-frame-parameters (selected-frame) (list (cons 'foreground-color color-name))) (or window-system @@ -1087,7 +1087,7 @@ To get the frame's current foreground color, use `frame-parameters'." "Set the text cursor color of the selected frame to COLOR-NAME. When called interactively, prompt for the name of the color to use. To get the frame's current cursor color, use `frame-parameters'." - (interactive (list (facemenu-read-color "Cursor color: "))) + (interactive (list (read-color "Cursor color: "))) (modify-frame-parameters (selected-frame) (list (cons 'cursor-color color-name)))) @@ -1095,7 +1095,7 @@ To get the frame's current cursor color, use `frame-parameters'." "Set the color of the mouse pointer of the selected frame to COLOR-NAME. When called interactively, prompt for the name of the color to use. To get the frame's current mouse color, use `frame-parameters'." - (interactive (list (facemenu-read-color "Mouse color: "))) + (interactive (list (read-color "Mouse color: "))) (modify-frame-parameters (selected-frame) (list (cons 'mouse-color (or color-name @@ -1106,7 +1106,7 @@ To get the frame's current mouse color, use `frame-parameters'." "Set the color of the border of the selected frame to COLOR-NAME. When called interactively, prompt for the name of the color to use. To get the frame's current border color, use `frame-parameters'." - (interactive (list (facemenu-read-color "Border color: "))) + (interactive (list (read-color "Border color: "))) (modify-frame-parameters (selected-frame) (list (cons 'border-color color-name)))) |