summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el6
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))