[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode 3ce23bb 49/87: Merge branch 'master' of
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode 3ce23bb 49/87: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode |
Date: |
Wed, 14 Apr 2021 18:47:06 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit 3ce23bba3cb50562693860f87f3528c471d603ba
Merge: dfb5a43 6231ee0
Author: Fidler <matthew.fidler@gmail.com>
Commit: Fidler <matthew.fidler@gmail.com>
Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode
---
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))))))))
- [elpa] externals/ergoemacs-mode 7e31354 33/87: Merge pull request #450 from MicroAnibal/PotugueseLayout, (continued)
- [elpa] externals/ergoemacs-mode 7e31354 33/87: Merge pull request #450 from MicroAnibal/PotugueseLayout, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 9acd205 34/87: Fix Issue #451 by coding a new old binding function, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 8ea44c2 18/87: Bug fix for modifiers, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 6a3214e 58/87: Merge pull request #490 from Valdaer/keep-region-selected-after-ctrl-c, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 0a9e83e 37/87: Fix eurgoemacs to be ergoemacs. See Issue #453, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 3ea0220 31/87: Add Qwidget for nomachine, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode a87fae7 45/87: Fix passing of multiple forms for evaluation on new emacs process, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 8a65bf2 59/87: Fix typos (dispaly -> display), Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 427d0e4 16/87: Only echo on prefix keys, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 5a7c4c6 20/87: Test for Issue #437, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 3ce23bb 49/87: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode fad3ed1 56/87: Fixed not removing visible selection when ergoemacs-keep-region-after-copy is set to true., Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode d51ae7e 35/87: Merge remote-tracking branch 'origin/master', Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 4769abe 61/87: Update Mac instructions to swap Command and Alt, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 981ffb3 21/87: Fix Issue #437, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 730306e 66/87: Merge pull request #495 from wlandry/mac_meta_alt_switch, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 4710b5f 14/87: Fix eating of the variable, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode daec6a1 38/87: May Fix Issue #453, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 7b06006 44/87: Merge pull request #465 from MicroAnibal/FixLayoutsTypo, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 3e6fea9 41/87: Possibly fix #453, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 6231ee0 47/87: Merge pull request #468 from m00natic/emacs26-fixes, Stefan Monnier, 2021/04/14