X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/be5722e930b71fbbca049bd924b0b2f6dafa72b4..ddce73d32fa3e62e022842e3bbdc0aa83bb358cc:/lisp/startup.el?ds=sidebyside

diff --git a/lisp/startup.el b/lisp/startup.el
index 0dacf191c1..a1d1c3120f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1286,11 +1286,6 @@ 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)
 	   (string-equal (file-name-as-directory (expand-file-name dir))
 			 (expand-file-name user-emacs-directory))
 	   (setq warned t)
@@ -1496,7 +1491,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