Mercurial > emacs
comparison lisp/loadup.el @ 96830:a8aac59d9c7a
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 20 Jul 2008 00:37:45 +0000 |
| parents | e2bc3521cdab |
| children | 72d6895432c7 |
comparison
equal
deleted
inserted
replaced
| 96829:57e1550dd32a | 96830:a8aac59d9c7a |
|---|---|
| 180 (load "mwheel") | 180 (load "mwheel") |
| 181 (load "tool-bar"))) | 181 (load "tool-bar"))) |
| 182 (if (featurep 'x) | 182 (if (featurep 'x) |
| 183 (progn | 183 (progn |
| 184 (load "x-dnd") | 184 (load "x-dnd") |
| 185 (load "term/common-win") | |
| 185 (load "term/x-win"))) | 186 (load "term/x-win"))) |
| 186 | 187 |
| 187 (message "%s" (garbage-collect)) | 188 (message "%s" (garbage-collect)) |
| 188 | 189 |
| 189 (if (eq system-type 'vax-vms) | 190 (if (eq system-type 'vax-vms) |
| 190 (progn | 191 (progn |
| 191 (load "vms-patch"))) | 192 (load "vms-patch"))) |
| 192 (if (eq system-type 'windows-nt) | 193 (if (eq system-type 'windows-nt) |
| 193 (progn | 194 (progn |
| 194 (load "w32-vars") | 195 (load "w32-vars") |
| 196 (load "term/common-win") | |
| 195 (load "term/w32-win") | 197 (load "term/w32-win") |
| 196 (load "ls-lisp") | 198 (load "ls-lisp") |
| 197 (load "disp-table") ; needed to setup ibm-pc char set, see internal.el | 199 (load "disp-table") ; needed to setup ibm-pc char set, see internal.el |
| 198 (load "dos-w32") | 200 (load "dos-w32") |
| 199 (load "w32-fns"))) | 201 (load "w32-fns"))) |