diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-25 19:59:05 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-25 19:59:05 -0700 |
| commit | 725513b7d9eea9e78ef9c61a604660450fa6831d (patch) | |
| tree | 768c56154549e481e05fb67b29f960ad129002f5 /lisp/loadup.el | |
| parent | 6ee7927589ecc3e7fa058e1d2d9e3ae299ea068b (diff) | |
| download | emacs-725513b7d9eea9e78ef9c61a604660450fa6831d.tar.gz | |
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.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 775b6ee4aea..d13e38c0b36 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -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. |