# HG changeset patch # User Glenn Morris # Date 1287718640 25200 # Node ID caebfc6134af5119ba98502cb79d44996a721099 # Parent d8eec5279e5e5c7a556d2cc8631ab7a655d47f3d * src/Makefile.in (SOME_MACHINE_LISP): Add w32-vars. Remove ccl and duplicate mouse. diff -r d8eec5279e5e -r caebfc6134af src/ChangeLog --- a/src/ChangeLog Thu Oct 21 20:34:22 2010 -0700 +++ b/src/ChangeLog Thu Oct 21 20:37:20 2010 -0700 @@ -1,3 +1,8 @@ +2010-10-22 Glenn Morris + + * Makefile.in (SOME_MACHINE_LISP): Add w32-vars. + Remove ccl and duplicate mouse. + 2010-10-21 Chong Yidong * insdel.c (prepare_to_modify_buffer): Don't set diff -r d8eec5279e5e -r caebfc6134af src/Makefile.in --- a/src/Makefile.in Thu Oct 21 20:34:22 2010 -0700 +++ b/src/Makefile.in Thu Oct 21 20:37:20 2010 -0700 @@ -1,5 +1,5 @@ +# src/Makefile for GNU Emacs. -# Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. @@ -575,18 +575,18 @@ ## Like $shortlisp, but includes only those files from $lisp that are loaded ## conditionally (i.e., only on some platforms). +## Confusingly, term/internal is not in loadup, but is unconditionally +## loaded by pc-win, which is. SOME_MACHINE_LISP = ../lisp/mouse.elc \ ../lisp/select.elc ../lisp/scroll-bar.elc \ ../lisp/ls-lisp.elc ../lisp/dos-fns.elc \ ../lisp/w32-fns.elc ../lisp/dos-w32.elc \ - ../lisp/disp-table.elc ../lisp/dos-vars.elc \ + ../lisp/disp-table.elc ../lisp/dos-vars.elc ../lisp/w32-vars.elc \ ../lisp/tooltip.elc ../lisp/image.elc \ ../lisp/fringe.elc ../lisp/dnd.elc \ ../lisp/mwheel.elc ../lisp/tool-bar.elc \ ../lisp/x-dnd.elc ../lisp/dynamic-setting.elc \ - ../lisp/international/ccl.elc \ ../lisp/international/fontset.elc \ - ../lisp/mouse.elc \ ../lisp/term/common-win.elc \ ../lisp/term/x-win.elc \ ../lisp/term/pc-win.elc ../lisp/term/internal.elc \