X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7410c4e8720ff62f69e5032f1c2fd0325fb8457a..bee76e566c0e8d9f0b9fc6a48a36cf53e5408f91:/lisp/startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 1f524dc119..c04b16c43c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -950,11 +950,11 @@ please check its value")
       ;; Process window-system specific command line parameters.
       (setq command-line-args
 	    (funcall
-             (gui-method handle-args-function (or initial-window-system t))
+             (gui-method handle-args-function initial-window-system)
 	     command-line-args))
       ;; Initialize the window system. (Open connection, etc.)
       (funcall
-       (gui-method window-system-initialization (or initial-window-system t)))
+       (gui-method window-system-initialization initial-window-system))
       (put initial-window-system 'window-system-initialized t))
     ;; If there was an error, print the error message and exit.
     (error
@@ -1286,11 +1286,7 @@ the `--debug-init' option to view a complete error backtrace."
   (let (warned)
     (dolist (dir load-path)
       (and (not warned)
-	   (string-match-p
-	    (format "/%s/?\\'"
-		    (regexp-quote
-		     (file-name-nondirectory
-		      (directory-file-name user-emacs-directory)))) dir)
+	   (stringp dir)
 	   (string-equal (file-name-as-directory (expand-file-name dir))
 			 (expand-file-name user-emacs-directory))
 	   (setq warned t)
@@ -1496,7 +1492,10 @@ Each element in the list should be a list of strings or pairs
 	      (title (with-temp-buffer
 		       (insert-file-contents
 			(expand-file-name tut tutorial-directory)
-			nil 0 256)
+			;; Read the entire file, to make sure any
+			;; coding cookies and other local variables
+			;; get acted upon.
+			nil)
 		       (search-forward ".")
 		       (buffer-substring (point-min) (1- (point))))))
 	 ;; If there is a specific tutorial for the current language