diff options
| author | Glenn Morris | 2010-03-28 11:55:20 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-03-28 11:55:20 -0700 |
| commit | 25c72475f4519a3e0566996b1407ce63e4d87b8c (patch) | |
| tree | 882f6cd5a45e86f360d8ee288f7de0274337b657 /src | |
| parent | 8233e79a5642617028530f88c8ffa98901984d30 (diff) | |
| download | emacs-25c72475f4519a3e0566996b1407ce63e4d87b8c.tar.gz emacs-25c72475f4519a3e0566996b1407ce63e4d87b8c.zip | |
Close bug#5336.
* Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
in the DOC file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3f22b7eaea9..5c9c19bbcb1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-03-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always | ||
| 4 | in the DOC file. (Bug#5336) | ||
| 5 | |||
| 1 | 2010-03-24 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-03-24 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730). | 8 | * xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730). |
diff --git a/src/Makefile.in b/src/Makefile.in index 11facec6023..9caa01d9066 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -579,7 +579,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ | |||
| 579 | in case they are needed there. */ | 579 | in case they are needed there. */ |
| 580 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ | 580 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ |
| 581 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ | 581 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ |
| 582 | fontset.o \ | 582 | fontset.o dbusbind.o \ |
| 583 | nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ | 583 | nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ |
| 584 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ | 584 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ |
| 585 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) | 585 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) |