Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
111182:d6dad5b04eb8 | 111183:72ef880ed198 |
---|---|
231 ;; ``window system'', which generally behaves like a terminal. | 231 ;; ``window system'', which generally behaves like a terminal. |
232 (load "term/pc-win") | 232 (load "term/pc-win") |
233 (load "ls-lisp") | 233 (load "ls-lisp") |
234 (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el | 234 (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el |
235 (if (featurep 'ns) | 235 (if (featurep 'ns) |
236 (load "term/ns-win")) | 236 (progn |
237 (load "term/common-win") | |
238 (load "term/ns-win"))) | |
237 (if (fboundp 'x-create-frame) | 239 (if (fboundp 'x-create-frame) |
238 ;; Do it after loading term/foo-win.el since the value of the | 240 ;; Do it after loading term/foo-win.el since the value of the |
239 ;; mouse-wheel-*-event vars depends on those files being loaded or not. | 241 ;; mouse-wheel-*-event vars depends on those files being loaded or not. |
240 (load "mwheel")) | 242 (load "mwheel")) |
241 ;; Preload some constants and floating point functions. | 243 ;; Preload some constants and floating point functions. |