aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-09-21 23:32:49 +0000
committerDan Nicolaescu2008-09-21 23:32:49 +0000
commit9ba6e7d4b6902bd12f524cf51ba4bb74bfcd03fe (patch)
treec1194982cd90e7c4f89925c0c8f1fe19630c3d55
parenteab2ee89441d51e885e3df6b3fbcb3c12a177232 (diff)
downloademacs-9ba6e7d4b6902bd12f524cf51ba4bb74bfcd03fe.tar.gz
emacs-9ba6e7d4b6902bd12f524cf51ba4bb74bfcd03fe.zip
(command-line): Remove always true test.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/startup.el3
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4479267b406..da8b2f3cc93 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
12008-09-21 Dan Nicolaescu <dann@ics.uci.edu> 12008-09-21 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * startup.el (command-line): Start the server when in daemon mode. 3 * startup.el (command-line): Start the server when in daemon mode.
4 Remove always true test.
4 5
5 * frame.el (frame-initialize): Remove spurious setting of 6 * frame.el (frame-initialize): Remove spurious setting of
6 special-display-function with the default value. 7 special-display-function with the default value.
diff --git a/lisp/startup.el b/lisp/startup.el
index 5ad00c2f456..dd8fce06a48 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -888,8 +888,7 @@ opening the first frame (e.g. open a connection to an X server).")
888 ;; any oxof those. 888 ;; any oxof those.
889 (server-start) 889 (server-start)
890 ;; Under X Window, this creates the X frame and deletes the terminal frame. 890 ;; Under X Window, this creates the X frame and deletes the terminal frame.
891 (when (fboundp 'frame-initialize) 891 (frame-initialize))
892 (frame-initialize)))
893 892
894 ;; Turn off blinking cursor if so specified in X resources. This is here 893 ;; Turn off blinking cursor if so specified in X resources. This is here
895 ;; only because all other settings of no-blinking-cursor are here. 894 ;; only because all other settings of no-blinking-cursor are here.