diff options
| author | Eli Zaretskii | 2012-12-10 15:25:17 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-12-10 15:25:17 +0200 |
| commit | 2b8c906403908a5037b52bfecb72b65d0ce0cd1e (patch) | |
| tree | f1d720c43535ee624f02cf2b47f24e44d4a80e99 /lib-src | |
| parent | f282b9f7987fd7c2c8e323cc9f934ea53c05c3af (diff) | |
| download | emacs-2b8c906403908a5037b52bfecb72b65d0ce0cd1e.tar.gz emacs-2b8c906403908a5037b52bfecb72b65d0ce0cd1e.zip | |
Final cleanups and updated ChangeLog entries.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 9 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 3a5440ed782..58fec00da41 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (obj): Add w32notify.o. Add missing X and Unix | ||
| 4 | sources. | ||
| 5 | |||
| 1 | 2012-12-02 Kevin Ryde <user42@zip.com.au> | 6 | 2012-12-02 Kevin Ryde <user42@zip.com.au> |
| 2 | 7 | ||
| 3 | * etags.c (Lisp_functions): Skip (defvar foo) declarations unless | 8 | * etags.c (Lisp_functions): Skip (defvar foo) declarations unless |
| @@ -104,10 +109,6 @@ | |||
| 104 | (main): Retry connection with alt_display if connection with main | 109 | (main): Retry connection with alt_display if connection with main |
| 105 | display fails. | 110 | display fails. |
| 106 | 111 | ||
| 107 | 2012-10-07 Eli Zaretskii <eliz@gnu.org> | ||
| 108 | |||
| 109 | * makefile.w32-in (obj): Add w32notify.o. | ||
| 110 | |||
| 111 | 2012-10-01 Fabrice Popineau <fabrice.popineau@gmail.com> | 112 | 2012-10-01 Fabrice Popineau <fabrice.popineau@gmail.com> |
| 112 | 113 | ||
| 113 | * make-docfile.c (write_globals): Special-case | 114 | * make-docfile.c (write_globals): Special-case |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 9e005a56211..2d4270b0e96 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -123,9 +123,12 @@ $(BLD)/profile.exe: $(PROFILEOBJS) | |||
| 123 | # | 123 | # |
| 124 | obj = dosfns.o msdos.o \ | 124 | obj = dosfns.o msdos.o \ |
| 125 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ | 125 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ |
| 126 | fontset.o menu.o \ | 126 | fontset.o menu.o dbusbind.o cygw32.o \ |
| 127 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \ | 127 | nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ |
| 128 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o w32notify.o \ | ||
| 128 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ | 129 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ |
| 130 | w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \ | ||
| 131 | xsettings.o xgselect.o termcap.o \ | ||
| 129 | font.o w32font.o w32uniscribe.o w32notify.o \ | 132 | font.o w32font.o w32uniscribe.o w32notify.o \ |
| 130 | dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \ | 133 | dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \ |
| 131 | charset.o coding.o category.o ccl.o character.o chartab.o \ | 134 | charset.o coding.o category.o ccl.o character.o chartab.o \ |