diff options
| author | Kenichi Handa <[email protected]> | 2010-11-01 16:53:08 +0900 |
|---|---|---|
| committer | Kenichi Handa <[email protected]> | 2010-11-01 16:53:08 +0900 |
| commit | f6f3366160e26ff5984f287e60616ec9f90acfa3 (patch) | |
| tree | 9f5c8dc73cad6319a8fdf1ab22fd4e9901089e50 /lisp/faces.el | |
| parent | 65b6b59a8030b09d2a32ee88837a061e22751988 (diff) | |
| parent | ca7c89d8f52b34f694031f496600f949640ff9c4 (diff) | |
merge trunk
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 5e421f3f70..62428c0d29 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -30,7 +30,7 @@ (eval-when-compile (require 'cl)) -(declare-function xw-defined-colors "term/x-win" (&optional frame)) +(declare-function xw-defined-colors "term/common-win" (&optional frame)) (defvar help-xref-stack-item) @@ -1957,7 +1957,7 @@ Value is the new parameter list." (list (cons 'cursor-color fg))))))) (declare-function x-create-frame "xfns.c" (parms)) -(declare-function x-setup-function-keys "term/x-win" (frame)) +(declare-function x-setup-function-keys "term/common-win" (frame)) (defun x-create-frame-with-faces (&optional parameters) "Create and return a frame with frame parameters PARAMETERS. @@ -2578,5 +2578,4 @@ also the same size as FACE on FRAME, or fail." (provide 'faces) -;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6 ;;; faces.el ends here |