procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Browse source
This commit is contained in:
Alan Mackenzie 2014-11-22 21:44:23 +00:00
commit 239cd5b627
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2014-11-22 Glenn Morris <rgm@gnu.org>
* Makefile.in (emacs.res): Add dependency on icons/hand.cur. Use $<.
2014-11-22 Martin Rudalics <rudalics@gmx.at>
Don't shrink frame when using desktop-save-mode (Bug#19048).

5
src/Makefile.in
View file

@ -548,11 +548,12 @@ $(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in ../config.status \
doc.o: buildobj.h
## This rule (and file) is duplicated in nt/: why?
emacs.res: $(ntsource)/emacs.rc \
$(ntsource)/icons/emacs.ico \
$(ntsource)/icons/hand.cur \
$(ntsource)/$(EMACS_MANIFEST)
$(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt \
-o $@ $(ntsource)/emacs.rc
$(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt -o $@ $<
.PHONY: ns-app
ns-app: emacs$(EXEEXT)