From: Glenn Morris <rgm@gnu.org>
Date: Thu, 14 Jan 2021 15:50:28 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c83590b12114a0958c8e26846c87c84f492405bc;p=emacs.git

Merge from origin/emacs-27

488204cdc6 (origin/emacs-27) Remove one of recently added warnings ab...
55bc1560ac Fix assertion failure in window_box_height (Bug#45737)
27743e9e70 Fix cl-concatenate inlining
32a3758c84 Fix infloop in 'pixel-scroll-mode'
74d18957b8 Fix inhibiting the default.el loading in user init file
---

c83590b12114a0958c8e26846c87c84f492405bc
diff --cc lisp/startup.el
index 57fd87f20f9,b60c13e4487..cc14fb28140
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@@ -1372,9 -1389,9 +1373,9 @@@ please check its value"
           "~/.emacs")))
       (lambda ()
         (expand-file-name
 -        "init"
 +        "init.el"
          startup-init-directory))
-      (not inhibit-default-init))
+      t)
  
      (when (and deactivate-mark transient-mark-mode)
        (with-current-buffer (window-buffer)