branch: externals/ergoemacs-mode
commit 2798242ad38107b2cce25d0d3dde141d92177227
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Remove all of the ERGOEMACS-* environment variables
---
ergoemacs-functions.el | 2 --
ergoemacs-lib.el | 1 -
ergoemacs-mode.el | 12 ++++--------
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 94b8bfa..fefba48 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -272,8 +272,6 @@ The PROCESS is the process where the clean environment is
run."
(ergoemacs-load (or ergoemacs-run-clean
" --load=\"ergoemacs-mode\"
--load=\"ergoemacs-test\" --eval \"(progn (require 'elp) (setq debug-on-error
t) (elp-instrument-package (symbol-name 'ergoemacs-)) (ergoemacs-mode 1)
(run-with-idle-timer 0.1 nil 'elp-results))\""))
cmd process rm-batch)
- (when ergoemacs-keyboard-layout
- (setenv "ERGOEMACS_KEYBOARD_LAYOUT" ergoemacs-keyboard-layout))
(cond
((with-current-buffer (get-buffer-create "*ergoemacs-clean*")
(not ergoemacs-terminal))
diff --git a/ergoemacs-lib.el b/ergoemacs-lib.el
index 5e7681c..4abe2ae 100644
--- a/ergoemacs-lib.el
+++ b/ergoemacs-lib.el
@@ -506,7 +506,6 @@ The reset is done with `ergoemacs-mode-reset'."
(interactive)
(if (called-interactively-p 'any)
(progn
- (setenv "ERGOEMACS_KEYBOARD_LAYOUT" ergoemacs-keyboard-layout)
(shell-command (format "%s -Q --batch -l %s/ergoemacs-mode --eval
\"(ergoemacs-gen-ahk %s)\" &"
(ergoemacs-emacs-exe)
ergoemacs-dir (if current-prefix-arg "t"
"nil"))))
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index f29c224..5dbb1db 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -111,9 +111,7 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and
end-of-buffer Alt+Shift+n"
ergoemacs-variant
(if (and (boundp 'ergoemacs-theme)
ergoemacs-theme)
ergoemacs-theme
- (if (getenv "ERGOEMACS_THEME")
- (getenv "ERGOEMACS_THEME")
- nil)))
+ nil))
"Ergoemacs Keyboard Layout Themes."
:type '(choice
(const :tag "Standard" :value nil)
@@ -140,9 +138,8 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and
end-of-buffer Alt+Shift+n"
(defvar ergoemacs-map--breadcrumb ""
"Breadcrumb that is used to figure out what map is being modified.")
-(defcustom ergoemacs-keyboard-layout (or (getenv "ERGOEMACS_KEYBOARD_LAYOUT")
"us")
- (concat "Specifies which keyboard layout to use.
- This is a mirror of the environment variable ERGOEMACS_KEYBOARD_LAYOUT.")
+(defcustom ergoemacs-keyboard-layout "us"
+ (concat "Specifies which keyboard layout to use.")
:type 'sexp
:set #'ergoemacs-set-default
:initialize #'custom-initialize-default
@@ -721,9 +718,8 @@ not be useful. However instead of using
(autoload 'ergoemacs-theme "ergoemacs-macros")
(autoload 'ergoemacs "ergoemacs-macros")
-(defcustom ergoemacs-keyboard-layout (or (getenv "ERGOEMACS_KEYBOARD_LAYOUT")
"us")
+(defcustom ergoemacs-keyboard-layout "us"
(concat "Specifies which keyboard layout to use.
-This is a mirror of the environment variable ERGOEMACS_KEYBOARD_LAYOUT.
Valid values are:
" (ergoemacs-layouts--custom-documentation)
