Mercurial > emacs
diff lisp/loadup.el @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | ec6b072ac35c 0dcd1f3c9909 |
children | 880960b70474 |
line wrap: on
line diff
--- a/lisp/loadup.el Sat Oct 27 00:30:50 2007 +0000 +++ b/lisp/loadup.el Sat Oct 27 09:12:07 2007 +0000 @@ -185,11 +185,11 @@ (load "vms-patch"))) (if (eq system-type 'windows-nt) (progn + (load "w32-vars") (load "term/w32-win") (load "ls-lisp") (load "disp-table") ; needed to setup ibm-pc char set, see internal.el (load "dos-w32") - (load "w32-vars") (load "w32-fns"))) (if (eq system-type 'ms-dos) (progn