aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-10-06 05:44:11 +0000
committerDan Nicolaescu2008-10-06 05:44:11 +0000
commitcd1d1525597e3fb9476daaf79a0a5fa405f0a8ae (patch)
tree423c24ac9f5f4b169f2e037596f5ab32b362b3ed
parent1a0cf619dbaf78fa268c89ae5916a62bbe3d1212 (diff)
downloademacs-cd1d1525597e3fb9476daaf79a0a5fa405f0a8ae.tar.gz
emacs-cd1d1525597e3fb9476daaf79a0a5fa405f0a8ae.zip
(x-create-frame-with-faces): Undo previous change.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/faces.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a06b1120471..8e3496d2323 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-10-06 Dan Nicolaescu <dann@ics.uci.edu> 12008-10-06 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * faces.el (x-create-frame-with-faces): Undo previous change.
4
3 * vc-cvs.el (vc-cvs-after-dir-status): Parse the output for non 5 * vc-cvs.el (vc-cvs-after-dir-status): Parse the output for non
4 existent files. 6 existent files.
5 7
diff --git a/lisp/faces.el b/lisp/faces.el
index e9bc6b05fd1..269a90972c0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2007,8 +2007,7 @@ Value is the new frame created."
2007 ;; Make sure the tool-bar is ready to be enabled. The 2007 ;; Make sure the tool-bar is ready to be enabled. The
2008 ;; `tool-bar-lines' frame parameter will not take effect 2008 ;; `tool-bar-lines' frame parameter will not take effect
2009 ;; without this call. 2009 ;; without this call.
2010 (when tool-bar-mode 2010 (tool-bar-setup frame)
2011 (tool-bar-setup frame))
2012 (if (null visibility-spec) 2011 (if (null visibility-spec)
2013 (make-frame-visible frame) 2012 (make-frame-visible frame)
2014 (modify-frame-parameters frame (list visibility-spec))) 2013 (modify-frame-parameters frame (list visibility-spec)))