aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-05-08 20:24:37 -0400
committerGlenn Morris2015-05-08 20:24:37 -0400
commit36c6d20bea2f8af4de126d0d503e3904ee7ab484 (patch)
tree8641561c5634ae449014764f4cbef2b476781dc0
parent30ba66a6ecb4c5b7138d60ea485789517cb8a873 (diff)
downloademacs-36c6d20bea2f8af4de126d0d503e3904ee7ab484.tar.gz
emacs-36c6d20bea2f8af4de126d0d503e3904ee7ab484.zip
Quieten --without-x compilation.
* lisp/term/common-win.el: Provide a feature. * lisp/term/x-win.el (term/common-win): Require it.
-rw-r--r--lisp/term/common-win.el2
-rw-r--r--lisp/term/x-win.el1
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 64459353e1c..98ad5acf268 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -419,4 +419,6 @@ the operating system.")
419 (setq defined-colors (cons this-color defined-colors)))) 419 (setq defined-colors (cons this-color defined-colors))))
420 defined-colors))) 420 defined-colors)))
421 421
422(provide 'term/common-win)
423
422;;; common-win.el ends here 424;;; common-win.el ends here
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index b0902942f8f..11fe93f88ba 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -72,6 +72,7 @@
72(if (not (fboundp 'x-create-frame)) 72(if (not (fboundp 'x-create-frame))
73 (error "%s: Loading x-win.el but not compiled for X" (invocation-name))) 73 (error "%s: Loading x-win.el but not compiled for X" (invocation-name)))
74 74
75(require 'term/common-win)
75(require 'frame) 76(require 'frame)
76(require 'mouse) 77(require 'mouse)
77(require 'scroll-bar) 78(require 'scroll-bar)