[elpa] 03/35: Fix #267

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit b73beadd7f6354ea2c63e0053acb5c02390de15c
Author: Matthew L. Fidler <address@hidden>
Date:   Mon Jul 7 08:03:00 2014 -0500

    Fix #267
---
 ergoemacs-advices.el |    3 +++
 ergoemacs-mode.el    |    2 +-
 ergoemacs-themes.el  |    3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el
index e4f6573..45e0d52 100644
--- a/ergoemacs-advices.el
+++ b/ergoemacs-advices.el
@@ -234,6 +234,9 @@ Uses `ergoemacs-real-key-description'."
             (setq test (ergoemacs-real-key-description (nth 0 test-hash)))
             (ergoemacs-pretty-key test))
         (let (ergoemacs-modal
+              ;; (ergoemacs-shortcut-keys (not map))
+              ergoemacs-shortcut-keys
+              (ergoemacs-no-shortcut-keys (not map))
               ergoemacs-repeat-keys
               ergoemacs-read-input-keys)
           (ergoemacs-pretty-key
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 4675f32..9d7efde 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -436,7 +436,6 @@ bindings the keymap is:
         ;; Setup keys
         (setq ergoemacs-shortcut-keymap (make-sparse-keymap)
               ergoemacs-no-shortcut-keymap (make-sparse-keymap))
-        (ergoemacs-setup-keys t)
         (ergoemacs-debug-heading "Ergoemacs Keys have loaded.")
         (when (and ergoemacs-use-mac-command-as-meta
                    (eq system-type 'darwin))
@@ -466,6 +465,7 @@ bindings the keymap is:
         ;; Fix `substitute-command-keys'
         (ergoemacs-enable-c-advices)
         (setq ergoemacs-unbind-keys t)
+        (ergoemacs-setup-keys t)
         (add-hook 'pre-command-hook 'ergoemacs-pre-command-hook)
         (ergoemacs-populate-pre-command-hook)
         (ergoemacs-debug-heading "Ergoemacs-mode turned ON."))
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 61f4e04..3cc3e37 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -48,7 +48,8 @@
         set-mark-command-repeat-pop t
         org-special-ctrl-a/e t
         ido-vertical-define-keys 'C-n-C-p-up-down-left-right
-        scroll-error-top-bottom t)
+        scroll-error-top-bottom t
+        initial-scratch-message (substitute-command-keys ";; This buffer is 
for notes you don't want to save, and for Lisp evaluation.\n;; If you want to 
create a file, visit that file with \\[find-file],\n;; then enter the text in 
that file's own buffer."))
   (add-hook 'kill-buffer-hook 'ergoemacs-save-buffer-to-recently-closed)
   (undo-tree-mode 1)
   (shift-select-mode t)