X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f0398ec17f8a00d6c6d828c3d04522d94337d156..4f85b47922a2e316ccd05be6be85842b2b5c03e3:/lisp/startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 44eea7745f..3f4923afb2 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,6 @@
 ;;; startup.el --- process Emacs shell arguments  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1992, 1994-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985-1986, 1992, 1994-2013 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -398,8 +397,6 @@ from being initialized."
 
 (defvar no-blinking-cursor nil)
 
-(defvar default-frame-background-mode)
-
 (defvar pure-space-overflow nil
   "Non-nil if building Emacs overflowed pure space.")
 
@@ -444,8 +441,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
       (let* ((this-dir (car dirs))
 	     (contents (directory-files this-dir))
 	     (default-directory this-dir)
-	     (canonicalized (if (fboundp 'untranslated-canonical-name)
-				(untranslated-canonical-name this-dir))))
+	     (canonicalized (if (fboundp 'w32-untranslated-canonical-name)
+				(w32-untranslated-canonical-name this-dir))))
 	;; The Windows version doesn't report meaningful inode numbers, so
 	;; use the canonicalized absolute file name of the directory instead.
 	(setq attrs (or canonicalized
@@ -494,6 +491,7 @@ It is the default value of the variable `top-level'."
     (setq command-line-processed t)
     (let ((dir default-directory))
       (with-current-buffer "*Messages*"
+        (messages-buffer-mode)
         ;; Make it easy to do like "tail -f".
         (set (make-local-variable 'window-point-insertion-type) t)
         ;; Give *Messages* the same default-directory as *scratch*,
@@ -1541,7 +1539,7 @@ a face or button specification."
 			   (t "splash.pbm")))
 	 (img (create-image image-file))
 	 (image-width (and img (car (image-size img))))
-	 (window-width (window-width (selected-window))))
+	 (window-width (window-width)))
     (when img
       (when (> window-width image-width)
 	;; Center the image in the window.