diff options
| author | João Távora <joaotavora@gmail.com> | 2021-10-02 00:49:48 +0100 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2021-10-02 01:43:16 +0100 |
| commit | 9307889d68222bad1a7e449d3adddac40da788cc (patch) | |
| tree | ead3d91bf099336508a980313d32666738fd1e1e /lisp/loadup.el | |
| parent | 5c77cc958451b3bc9ddb6752be1d32f50cba3e41 (diff) | |
| download | emacs-9307889d68222bad1a7e449d3adddac40da788cc.tar.gz emacs-9307889d68222bad1a7e449d3adddac40da788cc.tar.bz2 emacs-9307889d68222bad1a7e449d3adddac40da788cc.zip | |
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.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 6 |
1 files changed, 5 insertions, 1 deletions
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)) |