branch: externals/ergoemacs-mode
commit 6231ee0ae7014bd8f8ef2a3adc13b4d3d403bf71
Merge: 7b06006 4e188fd
Author: Matthew Fidler <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #468 from m00natic/emacs26-fixes
Emacs26 fixes
---
ergoemacs-functions.el | 2 +-
ergoemacs-map-properties.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 9edc59b..83ffe5c 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -2367,7 +2367,7 @@ exists and opens it in emacs, if possible."
;; Tilde (ñãõÑÃÕ)
(?\361 . ?n)(?\343 . ?a)(?\365 . ?o)(?\321 . ?N)(?\303 . ?A)(?\325 . ?O)
(?\337 . "ss") ; S-zed (Beta) (ß)
- (?\253 . ?")(?\273 . ?") ; Guillemets -> double quotes («»)
+ (?\253 . ?\")(?\273 . ?\") ; Guillemets -> double quotes («»)
(?\346 . "ae")(?\306 . "AE") ; ae, AE (æÆ)
(?\370 . ?o)(?\330 . ?O) ; Slashed O (øØ)
(?\260 . ?@)(?\345 . ?a)(?\305 . ?A) ; Angstrom (degree) (°åÅ)
diff --git a/ergoemacs-map-properties.el b/ergoemacs-map-properties.el
index 93bc19e..87f4d0d 100644
--- a/ergoemacs-map-properties.el
+++ b/ergoemacs-map-properties.el
@@ -651,7 +651,7 @@ These keymaps are saved in
`ergoemacs-map-properties--hook-map-hash'."
(ergoemacs-timing ergoemacs-create-global
(let* ((emacs-exe (ergoemacs-emacs-exe))
(default-directory (expand-file-name (file-name-directory
(locate-library "ergoemacs-mode"))))
- (cmd (format "%s -L %s --batch --load \"ergoemacs-mode\" -Q
--eval \"(ergoemacs-map-properties--default-global-gen) (kill-emacs)\""
emacs-exe default-directory)))
+ (cmd (format "%s -L %s --batch --load \"ergoemacs-mode\" -Q
--eval \"(progn (ergoemacs-map-properties--default-global-gen) (kill-emacs))\""
emacs-exe default-directory)))
(message "%s" (shell-command-to-string cmd))
(ergoemacs-map-properties--get-original-global-map))))))))
