diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
| commit | abe5f998744aff17d9503df4aa0665a8d364076a (patch) | |
| tree | bdd8f8fcaba76894ec3a2c7ff0b21a90fac1d0da /lisp/loadup.el | |
| parent | 120ad5ff6cfc79d5348844264678882fb41382ce (diff) | |
| parent | 124bd28c27d71cdfd08447db14f90846ca2ad69d (diff) | |
| download | emacs-abe5f998744aff17d9503df4aa0665a8d364076a.tar.gz | |
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
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 8cbf65ff5ba..36bedfc67ec 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -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 |