aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Brown2014-08-29 18:13:43 -0400
committerKen Brown2014-08-29 18:13:43 -0400
commit6141b80242b3da876e576cd19b263ef3ca4586b7 (patch)
treee4613ab01a52722fd6715a4f62eee82835fa4e38
parent6539a7e2a29d4f3e914e9bccd3f842c0641f815b (diff)
downloademacs-6141b80242b3da876e576cd19b263ef3ca4586b7.tar.gz
emacs-6141b80242b3da876e576cd19b263ef3ca4586b7.zip
* lisp/startup.el (fancy-splash-frame): Extend the fix for Bug#16014 to the Cygwin-w32 build. (Bug#18347)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81e9a0f2280..df8ce75a696 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-08-29 Ken Brown <kbrown@cornell.edu>
2
3 * startup.el (fancy-splash-frame): Extend the fix for Bug#16014 to
4 the Cygwin-w32 build. (Bug#18347)
5
12014-08-28 Glenn Morris <rgm@gnu.org> 62014-08-28 Glenn Morris <rgm@gnu.org>
2 7
3 * tar-mode.el (tar--extract, tar-extract): 8 * tar-mode.el (tar--extract, tar-extract):
diff --git a/lisp/startup.el b/lisp/startup.el
index a229207a2c8..58e970814b9 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1812,7 +1812,7 @@ we put it on this frame."
1812 (let (chosen-frame) 1812 (let (chosen-frame)
1813 ;; MS-Windows needs this to have a chance to make the initial 1813 ;; MS-Windows needs this to have a chance to make the initial
1814 ;; frame visible. 1814 ;; frame visible.
1815 (if (eq system-type 'windows-nt) 1815 (if (eq (window-system) 'w32)
1816 (sit-for 0 t)) 1816 (sit-for 0 t))
1817 (dolist (frame (append (frame-list) (list (selected-frame)))) 1817 (dolist (frame (append (frame-list) (list (selected-frame))))
1818 (if (and (frame-visible-p frame) 1818 (if (and (frame-visible-p frame)