]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Thu, 14 Jan 2021 15:50:28 +0000 (07:50 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 14 Jan 2021 15:50:28 +0000 (07:50 -0800)
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

1  2 
lisp/emacs-lisp/seq.el
lisp/isearch.el
lisp/pixel-scroll.el
lisp/startup.el
lisp/window.el

Simple merge
diff --cc lisp/isearch.el
Simple merge
Simple merge
diff --cc lisp/startup.el
index 57fd87f20f9f6e8808f78bd1768986db72968de0,b60c13e44878b6738b996c387da13752cbe2e881..cc14fb28140bb54553d9461f0185f4d1e3097a1d
@@@ -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)
diff --cc lisp/window.el
Simple merge