diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-11-03 15:58:33 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-11-03 15:58:33 +0200 |
| commit | 858f0f24b1433dcda709a33e932775e3aa96a786 (patch) | |
| tree | 0b715c63bb71454cad1ac86c751d5845c4ea0508 /lisp | |
| parent | 12fd5ee1ae617b212e4d00e2ed4c196d3656f615 (diff) | |
| parent | 1d4341f98813e8f2f4179e1d0a414b2f16c880eb (diff) | |
| download | emacs-858f0f24b1433dcda709a33e932775e3aa96a786.tar.gz | |
Adapt MSDOS port to latest changes.
config.bat: Copy lib/execinfo.in.h to lib/execinfo.in-h if needed.
msdos/sedlibmk.inp: Sync with changes in lib/Makefile.in.
(HAVE_DECL_ENVIRON, GNULIB_ENVIRON): Edit to require declaration
through lib/unistd.h.
msdos/sed1v2.inp: Sync with changes in src/Makefile.in.
msdos/sed2v2.inp: Sync with changes in src/config.in.
src/lisp.mk: Adjust comments to the fact that term/internal is now
loaded from loadup.el.
src/msdos.c (msdos_abort): Rename from emacs_abort, and make static.
(msdos_fatal_signal): New function.
(XMenuActivate): Adjust the call to kbd_buffer_events_waiting to
its argument list.
src/conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Define to "inline"
for GCC versions before 4.
(emacs_raise): Define to call msdos_fatal_signal.
lisp/term/pc-win.el: Don't load term/internal from here.
lisp/loadup.el: Load term/internal from here.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/loadup.el | 1 | ||||
| -rw-r--r-- | lisp/term/pc-win.el | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4844872c73a..993d4a2c4a0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-11-03 Eli Zaretskii <eliz@gnu.org> + + * term/pc-win.el: Don't load term/internal from here. + + * loadup.el: Load term/internal from here. + 2012-11-03 Fabián Ezequiel Gallina <fgallina@cuca> * progmodes/python.el (inferior-python-mode): Fix hang in diff --git a/lisp/loadup.el b/lisp/loadup.el index e5f2cb014d3..f017295c33b 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -257,6 +257,7 @@ (load "dos-vars") ;; Don't load term/common-win: it isn't appropriate for the `pc' ;; ``window system'', which generally behaves like a terminal. + (load "term/internal") (load "term/pc-win") (load "ls-lisp") (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index b460e3b8a14..9fd3bf14fe1 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -40,8 +40,6 @@ (error "%s: Loading pc-win.el but not compiled for MS-DOS" (invocation-name))) -(load "term/internal" nil t) - (declare-function msdos-remember-default-colors "msdos.c") (declare-function w16-set-clipboard-data "w16select.c") (declare-function w16-get-clipboard-data "w16select.c") |