diff options
| author | Ken Brown <kbrown@cornell.edu> | 2014-04-09 17:16:37 -0400 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2014-04-09 17:16:37 -0400 |
| commit | 0cccc183d7530d342e7970f4544cdf70e3327cb6 (patch) | |
| tree | 53838100f6169119fb7d3c7edcea5826f9a1e6c5 /nt | |
| parent | 50c9a9b8a871ce281b43a196bd912f3d2fdda5fa (diff) | |
| download | emacs-0cccc183d7530d342e7970f4544cdf70e3327cb6.tar.gz | |
Revert most of the recent change involving manifests on Cygwin. (Bug#17176)
* configure.ac (EMACS_MANIFEST): Revert last change (but leave
UPDATE_MANIFEST empty).
* nt/emacs.rc: Revert last change.
* src/Makefile.in (EMACS_MANIFEST): Revert last change.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/emacs.rc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 8e2875805dd..38e5512043d 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-04-09 Ken Brown <kbrown@cornell.edu> + + * emacs.rc: Revert last change. + 2014-04-03 Ken Brown <kbrown@cornell.edu> * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) diff --git a/nt/emacs.rc b/nt/emacs.rc index fa019b4d98a..92c303ad4ef 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -1,12 +1,10 @@ Emacs ICON icons/emacs.ico 32649 CURSOR icons/hand.cur -#ifndef __CYGWIN__ -#ifdef WIN64 +#if defined (WIN64) || defined (__x86_64__) 1 24 "emacs-x64.manifest" #else 1 24 "emacs-x86.manifest" #endif -#endif #ifndef VS_VERSION_INFO #define VS_VERSION_INFO 1 |