Mercurial > emacs
diff lisp/loadup.el @ 111183:72ef880ed198
Let ns load common-win.
* lisp/term/common-win.el (x-select-enable-clipboard):
* lisp/term/pc-win.el (x-select-enable-clipboard): Doc fix.
* lisp/term/ns-win.el: No need to require cl when compiling.
(x-display-name, x-setup-function-keys, x-select-text, x-colors)
(xw-defined-colors): Use the common-win definitions.
(ns-alternatives-map): Make it an obsolete alias for x-alternatives-map.
(ns-handle-iconic): Make it an alias for x-handle-iconic.
* lisp/term/common-win.el (x-select-text, x-alternatives-map)
(x-setup-function-keys, x-colors, xw-defined-colors): Handle 'ns case.
* lisp/loadup.el [ns]: Load common-win.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Mon, 25 Oct 2010 19:59:05 -0700 |
parents | c7d5564f0621 |
children | ca22802893d9 |
line wrap: on
line diff
--- a/lisp/loadup.el Tue Oct 26 10:31:27 2010 +0900 +++ b/lisp/loadup.el Mon Oct 25 19:59:05 2010 -0700 @@ -233,7 +233,9 @@ (load "ls-lisp") (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el (if (featurep 'ns) - (load "term/ns-win")) + (progn + (load "term/common-win") + (load "term/ns-win"))) (if (fboundp 'x-create-frame) ;; Do it after loading term/foo-win.el since the value of the ;; mouse-wheel-*-event vars depends on those files being loaded or not.