Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org

[bpt/emacs.git] / src / lisp.mk

diff --git a/src/lisp.mk b/src/lisp.mk
index 8c27101..59d5b86 100644 (file)
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -1,7 +1,7 @@
 ### lisp.mk --- src/Makefile fragment for GNU Emacs
 
-## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2012
-##   Free Software Foundation, Inc.
+## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 Free Software
+## Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -71,6 +71,7 @@ lisp = \
        $(lispsource)/faces.elc \
        $(lispsource)/button.elc \
        $(lispsource)/startup.elc \
+       $(lispsource)/emacs-lisp/nadvice.elc \
        $(lispsource)/minibuffer.elc \
        $(lispsource)/abbrev.elc \
        $(lispsource)/simple.elc \
@@ -129,6 +130,7 @@ lisp = \
        $(lispsource)/textmodes/page.elc \
        $(lispsource)/register.elc \
        $(lispsource)/textmodes/paragraphs.elc \
+       $(lispsource)/progmodes/prog-mode.elc \
        $(lispsource)/emacs-lisp/lisp-mode.elc \
        $(lispsource)/textmodes/text-mode.elc \
        $(lispsource)/textmodes/fill.elc \
@@ -150,6 +152,7 @@ lisp = \
        $(lispsource)/term/w32-win.elc \
        $(lispsource)/ls-lisp.elc \
        $(lispsource)/disp-table.elc \
+       $(lispsource)/w32-common-fns.elc \
        $(lispsource)/dos-w32.elc \
        $(lispsource)/w32-fns.elc \
        $(lispsource)/dos-fns.elc \
@@ -161,6 +164,8 @@ lisp = \
        $(lispsource)/emacs-lisp/float-sup.elc \
        $(lispsource)/vc/vc-hooks.elc \
        $(lispsource)/vc/ediff-hook.elc \
+       $(lispsource)/electric.elc \
+       $(lispsource)/uniquify.elc \
        $(lispsource)/tooltip.elc