From 9307889d68222bad1a7e449d3adddac40da788cc Mon Sep 17 00:00:00 2001 From: João Távora Date: Sat, 2 Oct 2021 00:49:48 +0100 Subject: Simplify shorthand injection (bug#50946) * lisp/loadup.el: Load "shorthands" relatively late. Set load-source-file-function to load-with-shorthands-and-code-conversion * lisp/international/mule.el (hack-elisp-shorthands) (load-with-shorthands-and-code-conversion): Move to lisp/shorthands.el * lisp/shorthands.el: New file. --- lisp/loadup.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 942057c838f..af997441d2e 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -151,7 +151,7 @@ ;; variable its advertised default value (it starts as nil, see ;; xdisp.c). (setq resize-mini-windows 'grow-only) -(setq load-source-file-function #'load-with-shorthands-and-code-conversion) +(setq load-source-file-function #'load-with-code-conversion) (load "files") ;; Load-time macro-expansion can only take effect after setting @@ -352,6 +352,10 @@ (load "vc/ediff-hook") (load "uniquify") (load "electric") + +(load "shorthands") +(setq load-source-file-function #'load-with-shorthands-and-code-conversion) + (load "emacs-lisp/eldoc") (load "cus-start") ;Late to reduce customize-rogue (needs loaddefs.el anyway) (if (not (eq system-type 'ms-dos)) -- cgit v1.2.3