[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 06/287: Don't use symbol-value
|
From: |
Matthew Fidler |
|
Subject: |
[elpa] 06/287: Don't use symbol-value |
|
Date: |
Wed, 02 Jul 2014 14:44:08 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit 535d625d06c8e9bc58519c0e2175e995e962d1fe
Author: Matthew L. Fidler <address@hidden>
Date: Fri May 23 18:10:10 2014 +0800
Don't use symbol-value
---
ergoemacs-extras.el | 6 +++---
ergoemacs-functions.el | 6 +++---
ergoemacs-layouts.el | 4 ++--
ergoemacs-menus.el | 6 +++---
ergoemacs-modal.el | 2 +-
ergoemacs-shortcuts.el | 38 +++++++++++++++++++-------------------
ergoemacs-test.el | 2 +-
ergoemacs-theme-engine.el | 44 ++++++++++++++++++++++----------------------
ergoemacs-track.el | 8 ++++----
ergoemacs-translate.el | 30 +++++++++++++++---------------
ergoemacs-unbind.el | 2 +-
11 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/ergoemacs-extras.el b/ergoemacs-extras.el
index 3201702..05d4ccb 100644
--- a/ergoemacs-extras.el
+++ b/ergoemacs-extras.el
@@ -587,7 +587,7 @@ function change_layout() {
(while (re-search-forward "\\<C-" nil t)
(replace-match (if swap-option-and-control "~" "^") nil t))
(setq ret (buffer-string)))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-gen-mac-osx (layout &optional file-name extra
swap-opiton-and-control)
"Generates an Autohotkey Script for Ergoemacs Keybindings.
@@ -1104,7 +1104,7 @@ Files are generated in the dir 〔ergoemacs-extras〕 at
`user-emacs-directory'.
(goto-char (point-min))
(while (re-search-forward ">\\(AA\\)<" nil t)
(replace-match "><" t)))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-keyfreq-calc-ergo (x list var-layout cmd-n total-n)
"Calculate keyfreq based on ergoemacs positions."
@@ -1637,7 +1637,7 @@ IS-PREFIX tell ergoemacs if this is a prefix diagram."
(message "Generated!"))
(when (called-interactively-p 'interactive)
(browse-url (concat "file://" file)))
- (symbol-value 'file)))
+ file))
;;;###autoload
(defun ergoemacs-svgs (&optional layouts)
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index bfc63ed..e535ff9 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -239,7 +239,7 @@ C-u C=u deletes old byte compilde `ergoemacs-mode' files."
(emacs-dir (invocation-directory))
(full-exe (concat "\"" (expand-file-name emacs-exe emacs-dir)
"\"")))
- (symbol-value 'full-exe)))
+ full-exe))
(defun ergoemacs-cheat-sheet-file ()
"Cheet sheet file for ergoemacs."
@@ -252,7 +252,7 @@ C-u C=u deletes old byte compilde `ergoemacs-mode' files."
(setq extra-dir (expand-file-name (concat "ergoemacs-layout-"
ergoemacs-keyboard-layout ".svg")))
(when (not (file-exists-p extra-dir))
(ergoemacs-gen-svg ergoemacs-theme "kbd-ergo.svg" (concat var-dir
"ergo-layouts")))
- (symbol-value 'extra-dir)))
+ extra-dir))
(defun ergoemacs-open-line ()
"Inserts an indented newline after the current line and moves the point to
it."
@@ -1886,7 +1886,7 @@ With a prefix, force regeneration. "
(browse-url-of-file file)
(error
(ergoemacs-open-in-external-app file)))))
- (symbol-value 'file)))
+ file))
;;; Unaccent region taken and modified from Drew Adam's unaccent.el
diff --git a/ergoemacs-layouts.el b/ergoemacs-layouts.el
index d4440c4..45d91ce 100644
--- a/ergoemacs-layouts.el
+++ b/ergoemacs-layouts.el
@@ -363,10 +363,10 @@
"Get the list of all known layouts."
(if (and ergoemacs-get-layouts-no-aliases
(not aliases))
- (symbol-value 'ergoemacs-get-layouts-no-aliases)
+ ergoemacs-get-layouts-no-aliases
(if (and ergoemacs-get-layouts-aliases
aliases)
- (symbol-value 'ergoemacs-get-layouts-aliases)
+ ergoemacs-get-layouts-aliases
(let (ret)
(mapatoms
(lambda(s)
diff --git a/ergoemacs-menus.el b/ergoemacs-menus.el
index c85c792..08e3ded 100644
--- a/ergoemacs-menus.el
+++ b/ergoemacs-menus.el
@@ -134,7 +134,7 @@ Tries to get the value from `ergoemacs-mode-names'. If not
guess the language n
(setq ret (car (cdr ret))))
(setq ret (concat (upcase (substring ret 0 1))
(substring ret 1)))
- (symbol-value 'ret)))
+ ret))
;; `Languages'
(defun ergoemacs-get-major-modes ()
@@ -683,9 +683,9 @@ All other modes are assumed to be minor modes or
unimportant.
(:toggle and
(boundp 'speedbar-frame)
(frame-live-p
- (symbol-value 'speedbar-frame))
+ speedbar-frame)
(frame-visible-p
- (symbol-value 'speedbar-frame)))
+ speedbar-frame))
:keys "")
;; (datetime-separator)
;; (showhide-date-time)
diff --git a/ergoemacs-modal.el b/ergoemacs-modal.el
index d39ab50..978145a 100644
--- a/ergoemacs-modal.el
+++ b/ergoemacs-modal.el
@@ -246,7 +246,7 @@ If so return the hash of translation values."
(lookup-key ergoemacs-modal-ignored-keymap
(or ergoemacs-single-command-keys
(this-single-command-keys))))
(setq ret nil)))
- (symbol-value 'ret))))
+ ret)))
(defun ergoemacs-modal-default (&optional arg)
"The default command for `ergoemacs-mode' modal.
diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 15070da..12b7227 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -179,7 +179,7 @@ This sequence is compatible with `listify-key-sequence'."
(setq input key))
((eq (type-of key) 'string) ;; Kbd code
(setq input (listify-key-sequence (read-kbd-macro key t)))))
- (symbol-value 'input)))
+ input))
(defun ergoemacs-universal-argument (&optional type)
"Ergoemacs universal argument.
@@ -415,7 +415,7 @@ universal argument can be entered.
((eq current-prefix-arg '-)
(setq current-prefix-arg nil)
(setq ret nil))))))))
- (symbol-value 'ret)))
+ ret))
(defcustom ergoemacs-read-swaps
'(((normal normal) unchorded)
@@ -504,7 +504,7 @@ It will replace anything defined by `ergoemacs-translation'"
(setq next-key (plist-put next-key var-pretty pretty))
(setq next-key (plist-put next-key var-s-pretty pretty))))
ergoemacs-translations)
- (symbol-value 'next-key)))
+ next-key))
(defvar ergoemacs-alt-text
(replace-regexp-in-string
@@ -531,7 +531,7 @@ It will replace anything defined by `ergoemacs-translation'"
(setq pretty (plist-get next-key ':alt-pretty))
(setq kbd (plist-get next-key ':alt))
(setq next-key (ergoemacs-read-key-install-next-key next-key key pretty
kbd))
- (symbol-value 'next-key)))
+ next-key))
(defun ergoemacs-read-key-next-key-is-ctl (&optional type pretty-key)
"The next key read is an Ctrl+ key. (or C- )"
@@ -546,7 +546,7 @@ It will replace anything defined by `ergoemacs-translation'"
(setq pretty (plist-get next-key ':ctl-pretty))
(setq kbd (plist-get next-key ':ctl))
(setq next-key (ergoemacs-read-key-install-next-key next-key key pretty
kbd))
- (symbol-value 'next-key)))
+ next-key))
(defun ergoemacs-read-key-next-key-is-alt-ctl (&optional type pretty-key)
"The next key read is an Alt+Ctrl+ key. (or C-M- )"
@@ -575,7 +575,7 @@ It will replace anything defined by `ergoemacs-translation'"
(setq pretty (plist-get next-key ':normal-pretty))
(setq kbd (plist-get next-key ':normal))
(setq next-key (ergoemacs-read-key-install-next-key next-key key pretty
kbd))
- (symbol-value 'next-key))))
+ next-key)))
(defun ergoemacs-read-key-help ()
"Show help for the current sequence KEY."
@@ -626,15 +626,15 @@ It will replace anything defined by
`ergoemacs-translation'"
(defun ergoemacs-defer-post-command-hook ()
"Defers `post-command-hook'."
(set-default 'ergoemacs-defer-post-command-hook (default-value
'post-command-hook))
- (set (make-local-variable 'ergoemacs-defer-post-command-hook) (symbol-value
'post-command-hook))
+ (set (make-local-variable 'ergoemacs-defer-post-command-hook)
post-command-hook)
(set (make-local-variable 'post-command-hook) nil)
(set-default 'post-command-hook nil))
(defun ergoemacs-restore-post-command-hook ()
(when (or (default-value 'ergoemacs-defer-post-command-hook)
- (symbol-value 'ergoemacs-defer-post-command-hook))
+ ergoemacs-defer-post-command-hook)
(set-default 'post-command-hook (default-value
'ergoemacs-defer-post-command-hook))
- (set (make-local-variable 'post-command-hook) (symbol-value
'ergoemacs-defer-post-command-hook))
+ (set (make-local-variable 'post-command-hook)
ergoemacs-defer-post-command-hook)
(set (make-local-variable 'ergoemacs-defer-post-command-hook) nil)
(set-default 'ergoemacs-defer-post-command-hook nil)))
@@ -732,7 +732,7 @@ In addition, when the function is called:
(setq tmp (intern (match-string 1 tmp)))
(setq type tmp
first-type tmp))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-read-key-lookup-get-ret (fn)
"Get ret type for FN.
@@ -748,7 +748,7 @@ to the appropriate values for `ergoemacs-read-key'.
(setq ret 'keymap))
(when (memq fn ergoemacs-universal-fns)
(setq ret (ergoemacs-read-key-lookup-get-ret---universal fn)))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-read-key-lookup (prior-key prior-pretty-key key pretty-key
force-key)
"Lookup KEY and run if necessary.
@@ -1067,7 +1067,7 @@ FORCE-KEY forces keys like <escape> to work properly.
;; Fix tempoary over
(when (and tmp-overlay (not
ergoemacs-read-key-overriding-overlay-save))
(delete-overlay tmp-overlay)))
- (symbol-value 'ret))
+ ret)
;; Turn off read-input-keys for shortcuts
(when unread-command-events
(when ergoemacs-modal
@@ -1092,7 +1092,7 @@ Otherwise add new translation to key-plist and return it."
(setq key-plist (plist-put key-plist (intern new-trans) kd))
(setq kd (ergoemacs-pretty-key kd))
(setq key-plist (plist-put key-plist (intern (concat new-trans
"-pretty")) kd)))
- (symbol-value 'key-plist)))
+ key-plist))
(defvar ergoemacs-shift-translated nil)
(defvar ergoemacs-deactivate-mark nil)
@@ -1488,7 +1488,7 @@ DEF can be:
(setq found
(ergoemacs-define-key keymap key new-def)))))
def))
- (symbol-value 'found)))
+ found))
((condition-case err
(interactive-form def)
(error nil))
@@ -1707,7 +1707,7 @@ This also considers archaic emacs bindings by looking at
in effect)."
(let ((ret (gethash (list function dont-ignore-menu)
ergoemacs-shortcut-function-binding-hash)))
(if ret
- (symbol-value 'ret)
+ ret
(setq ret (or
(if dont-ignore-menu
(where-is-internal function (current-global-map))
@@ -1717,7 +1717,7 @@ in effect)."
(where-is-internal function (current-global-map))))
(gethash function ergoemacs-where-is-global-hash)))
(puthash (list function dont-ignore-menu) ret
ergoemacs-shortcut-function-binding-hash)
- (symbol-value 'ret))))
+ ret)))
(defcustom ergoemacs-use-function-remapping t
"Uses function remapping.
@@ -1848,7 +1848,7 @@ user-defined keys.
(use-global-map old-global-map))
(when ret2
(setq ret (append ret2 ret)))
- (symbol-value 'ret))))
+ ret)))
(defun ergoemacs-shortcut-remap (function &optional keys)
"Runs the FUNCTION or whatever `ergoemacs-shortcut-remap-list' returns.
@@ -2013,7 +2013,7 @@ Setup C-c and C-x keys to be described properly.")
(overlay-put tmp-overlay 'priority 536870911))
;; (ergoemacs-debug-keymap 'override-text-map)
))))
- (symbol-value 'tmp-overlay)))
+ tmp-overlay))
(defun ergoemacs-install-shortcut-up--internal (text keymap &optional
dont-complete)
(let* ((keymap keymap)
@@ -2081,7 +2081,7 @@ Setup C-c and C-x keys to be described properly.")
"")
read-map)))
(puthash hashkey read-map ergoemacs-extract-map-hash))
- (symbol-value 'keymap)))
+ keymap))
(defun ergoemacs-install-shortcuts-up ()
"Installs ergoemacs shortcuts into overriding keymaps.
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index 55e1b90..a570aee 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -211,7 +211,7 @@ sunt in culpa qui officia deserunt mollit anim id est
laborum.")
(when (file-exists-p w-file)
(setq ret 't)
(delete-file w-file))
- (symbol-value 'ret)))
+ ret))
(ert-deftest ergoemacs-test-global-key-set-before-1 ()
"Test global set key before ergoemacs-mode loads."
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 018b89b..55883ec 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -353,17 +353,17 @@ particular it:
(setq ergoemacs-component-version-curr component-version)
(push ergoemacs-component-version-curr versions)
(unless ergoemacs-component-version-minor-mode-layout
- (setq ergoemacs-component-version-minor-mode-layout (symbol-value
'ergoemacs-component-version-minor-mode-layout)))
+ (setq ergoemacs-component-version-minor-mode-layout
ergoemacs-component-version-minor-mode-layout))
(unless ergoemacs-component-version-fixed-layout
- (setq ergoemacs-component-version-fixed-layout (symbol-value
'fixed-layout)))
+ (setq ergoemacs-component-version-fixed-layout fixed-layout))
(unless ergoemacs-component-version-fixed-layout-rm
- (setq ergoemacs-component-version-fixed-layout-rm (symbol-value
'fixed-layout-rm)))
+ (setq ergoemacs-component-version-fixed-layout-rm fixed-layout-rm))
(unless ergoemacs-component-version-fixed-layout
- (setq ergoemacs-component-version-variable-layout (symbol-value
'variable-layout)))
+ (setq ergoemacs-component-version-variable-layout variable-layout))
(unless ergoemacs-component-version-fixed-layout-rm
- (setq ergoemacs-component-version-variable-layout-rm (symbol-value
'variable-layout-rm)))
+ (setq ergoemacs-component-version-variable-layout-rm variable-layout-rm))
(unless ergoemacs-component-version-redundant-keys
- (setq ergoemacs-component-version-redundant-keys (symbol-value
'redundant-keys)))))
+ (setq ergoemacs-component-version-redundant-keys redundant-keys))))
(defun ergoemacs-theme-component--rm-key (key)
"Remove KEY from `ergoemacs-mode' keymaps"
@@ -654,7 +654,7 @@ DEF can be:
(ergoemacs-theme-component--define-key-in-keymaps
keymap keymap-shortcut key new-def)))))
def))
- (symbol-value 'found)))
+ found))
((condition-case err
(interactive-form def)
(error nil))
@@ -766,7 +766,7 @@ Formatted for use with `ergoemacs-theme-component-hash' it
will return ::version
(if best-version
(setq ret (concat "::" best-version))
(setq ret (concat "::" smallest-version))))
- (symbol-value 'ret))
+ ret)
""))
(defun ergoemacs-theme--install-shortcut-item (key args keymap lookup-keymap
@@ -893,7 +893,7 @@ This function does not finalize maps by installing them
into the original maps.
(push keymap-list ret)))
new-ret))))
(reverse component))
- (symbol-value 'ret))
+ ret)
;; Single component
(let ((true-component (replace-regexp-in-string ":\\(fixed\\|variable\\)"
""
(or (and (stringp
component) component)
@@ -1036,14 +1036,14 @@ This function does not finalize maps by installing them
into the original maps.
(push 'keymap composed-map)
(setq tmp `(,map-name ,(or (nth 1 keymap-list) (nth 1
fixed-map))
,composed-map ,full-shortcut-map-p))
- (symbol-value 'tmp))))
+ tmp)))
variable-maps))
(mapc
(lambda(keymap-list)
(unless (member (nth 0 keymap-list) already-done-list)
(push keymap-list ret)))
fixed-maps)
- (symbol-value 'ret))))
+ ret)))
(defun ergoemacs-theme-component-keymaps (component &optional version)
"Gets the keymaps for COMPONENT for component VERSION.
@@ -1525,10 +1525,10 @@ added to the appropriate startup hooks.
ergoemacs-component-version-variable-layout-rm)
ergoemacs-component-version-list))
(puthash (concat name ":plist") ',(nth 0 kb)
ergoemacs-theme-component-hash)
- (puthash (concat name ":fixed") (symbol-value 'fixed-layout)
ergoemacs-theme-component-hash)
- (puthash (concat name ":fixed-rm") (symbol-value 'fixed-layout-rm)
ergoemacs-theme-component-hash)
- (puthash (concat name ":variable") (symbol-value 'variable-layout)
ergoemacs-theme-component-hash)
- (puthash (concat name ":variable-rm") (symbol-value
'variable-layout-rm) ergoemacs-theme-component-hash)
+ (puthash (concat name ":fixed") fixed-layout
ergoemacs-theme-component-hash)
+ (puthash (concat name ":fixed-rm") fixed-layout-rm
ergoemacs-theme-component-hash)
+ (puthash (concat name ":variable") variable-layout
ergoemacs-theme-component-hash)
+ (puthash (concat name ":variable-rm") variable-layout-rm
ergoemacs-theme-component-hash)
(puthash (concat name ":version") versions
ergoemacs-theme-component-hash)
(puthash (concat name ":redundant") redundant-keys
ergoemacs-theme-component-hash)
(puthash (concat name ":minor") minor-mode-layout
ergoemacs-theme-component-hash)
@@ -1596,7 +1596,7 @@ added to the appropriate startup hooks.
(plist-get theme-plist ':optional-on)
(plist-get theme-plist ':components)))
(setq versions (sort versions 'string<))
- (symbol-value 'versions)))
+ versions))
(defun ergoemacs-theme-components (theme)
"Get a list of components used for the current theme.
@@ -1624,7 +1624,7 @@ This respects `ergoemacs-theme-options'."
(push x components)))))
(reverse (plist-get theme-plist ':optional-off)))
(setq components (reverse components))
- (symbol-value 'components)))
+ components))
(defun ergoemacs-theme-make-hooks (theme &optional remove-p)
"Creates hooks for THEME.
@@ -2012,7 +2012,7 @@ If OFF is non-nil, turn off the options instead."
(ergoemacs-menus-on))
(when (featurep 'ergoemacs-menus)
(ergoemacs-menus-off))))
- :button (:radio . (symbol-value 'ergoemacs-use-menus)))
+ :button (:radio . ergoemacs-use-menus))
(ergoemacs-save
menu-item "Save Settings for Future Sessions"
(lambda ()
@@ -2107,7 +2107,7 @@ Uses `ergoemacs-theme-component-keymaps' and
`ergoemacs-theme-components'"
(push menu-keymap keys)
(push 'keymap keys)
(setq ret`(,@prior ,keys ,@ret))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-theme-restore-maps (&optional no-message)
"Restore original keymaps.
@@ -2177,10 +2177,10 @@ Returns new keymap."
map)
new-keymap))
(push 'keymap new-keymap)
- (symbol-value 'new-keymap))
+ new-keymap)
(t
(define-key new-keymap key nil)
- (symbol-value 'new-keymap))))))
+ new-keymap)))))
(defvar ergoemacs-theme-hook nil)
(defun ergoemacs-theme-remove-key-list (list &optional no-message dont-install)
@@ -2409,7 +2409,7 @@ When SILENT is true, also include silent themes"
(append (gethash "defined-themes" ergoemacs-theme-hash)
(gethash "silent-themes" ergoemacs-theme-hash)))
(gethash "defined-themes" ergoemacs-theme-hash))))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-get-themes-type (&optional silent)
"Gets the customization types for `ergoemacs-theme'"
diff --git a/ergoemacs-track.el b/ergoemacs-track.el
index 97f7f0d..0a88d01 100644
--- a/ergoemacs-track.el
+++ b/ergoemacs-track.el
@@ -215,7 +215,7 @@
'home)
((= 4 (nth i ergoemacs-track-row))
'bottom))))
- (symbol-value 'ret))))
+ ret)))
(defvar ergoemacs-key-hash nil
"Key hash")
@@ -249,7 +249,7 @@ LAST-PLIST is the last property list returned by this
function or nil if nothing
(if layout
(let ((ret (gethash (cons (cons key1 key2) (cons last-plist layout))
ergoemacs-key-hash)))
(if ret
- (symbol-value 'ret)
+ ret
(let ((kp1 (gethash (cons layout key1) ergoemacs-key-hash))
(kp2 (gethash (cons layout key2) ergoemacs-key-hash))
kpl kpl1
@@ -411,7 +411,7 @@ LAST-PLIST is the last property list returned by this
function or nil if nothing
:finger-n ,(plist-get kp2 :finger-n)
:key ,key2)))))
(puthash (cons (cons key1 key2) (cons last-plist layout)) ret
ergoemacs-key-hash)
- (symbol-value 'ret)))
+ ret))
(let (ret)
(setq ret
(mapcar
@@ -427,7 +427,7 @@ LAST-PLIST is the last property list returned by this
function or nil if nothing
(puthash lay (+ dist (plist-get ret :d))
ergoemacs-distance-hash)
`(,lay ,ret)))
(ergoemacs-get-layouts)))
- (symbol-value 'ret))))
+ ret)))
(defvar ergoemacs-last-distance-plist nil
"Last distance plist")
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index 8b6cd4c..7873f90 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -80,7 +80,7 @@
;; Save it so the user doesn't see the buffer popup very much
;; (if at all).
(add-to-list 'ergoemacs-display-char-list (list (list face char
window-system) ret))
- (symbol-value 'ret)))
+ ret))
(error nil)))
(defvar ergoemacs-use-unicode-char t
@@ -197,7 +197,7 @@ This assumes `ergoemacs-use-unicode-char' is non-nil. When
(while (re-search-forward "Ctl[+]" nil t)
(replace-match "^")))
(setq ret (buffer-string)))))
- (symbol-value 'ret))))
+ ret)))
(defun ergoemacs-pretty-key-rep-internal ()
(let (case-fold-search)
@@ -227,7 +227,7 @@ This assumes `ergoemacs-use-unicode-char' is non-nil. When
(insert code)
(ergoemacs-pretty-key-rep-internal)
(setq ret (buffer-string)))))
- (symbol-value 'ret))
+ ret)
(when ergoemacs-use-ergoemacs-key-descriptions
(ergoemacs-pretty-key-rep-internal))))
@@ -253,7 +253,7 @@ This assumes `ergoemacs-use-unicode-char' is non-nil. When
;; Save it so the user doesn't see the buffer popup very much
;; (if at all).
(add-to-list 'ergoemacs-display-char-list (list (list face char
window-system) ret))
- (symbol-value 'ret)))
+ ret))
(error nil)))
;;; Actual Translations
@@ -365,7 +365,7 @@ This also creates functions:
(eval (macroexpand
`(defvar ,(intern (concat "ergoemacs-" (symbol-name (plist-get
arg-plist ':name)) "-modal-map"))
- ',(symbol-value 'keymap-modal)
+ ',keymap-modal
,(concat "Ergoemacs modal override map for "
(symbol-name (plist-get arg-plist ':name))
" translation.
@@ -373,7 +373,7 @@ This keymap is made in `ergoemacs-translation'"))))
(eval (macroexpand
`(defvar ,(intern (concat "ergoemacs-" (symbol-name (plist-get
arg-plist ':name)) "-translation-local-map"))
- ',(symbol-value 'keymap)
+ ',keymap
,(concat "Ergoemacs translation local map for "
(symbol-name (plist-get arg-plist ':name))
" translation setup.
@@ -609,7 +609,7 @@ Translates C-A into C-S-a."
(setq ret (concat (match-string 1 ret)
(match-string 2 ret)
(upcase (match-string 3 ret)))))))
- (symbol-value 'ret))))
+ ret)))
(defun ergoemacs-shift-translate-install (trans-plist ret-plist)
"Install shift translation"
@@ -634,7 +634,7 @@ Translates C-A into C-S-a."
(setq ret (plist-put ret name shift-translated))
(setq ret (plist-put ret k (read-kbd-macro shift-translated t)))
(setq ret (plist-put ret p (ergoemacs-pretty-key shift-translated))))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-translation-install (trans-plist orig-key ret-plist)
"Installs the translation.
@@ -720,7 +720,7 @@ properties are also added:
(setq ret (plist-put ret key (read-kbd-macro new-key t)))
(setq ret (plist-put ret pretty (ergoemacs-pretty-key new-key)))
(setq ret (ergoemacs-shift-translate-install trans-plist ret))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-translate (key)
"Translates KEY and returns a plist of the translations.
@@ -849,9 +849,9 @@ and `ergoemacs-pretty-key' descriptions.
(lambda(key plist)
(setq ret (ergoemacs-translation-install plist orig-key ret)))
ergoemacs-translations)
- (puthash orig-key (symbol-value 'ret) ergoemacs-translate-hash)
- (puthash key (symbol-value 'ret) ergoemacs-translate-hash)
- (symbol-value 'ret)))))
+ (puthash orig-key ret ergoemacs-translate-hash)
+ (puthash key ret ergoemacs-translate-hash)
+ ret))))
(defun ergoemacs-setup-translation (layout &optional base-layout)
"Setup translation from BASE-LAYOUT to LAYOUT."
@@ -946,7 +946,7 @@ If JUST-TRANSLATE is non-nil, just return the KBD code, not
the actual emacs key
(let ((new-key (gethash `(,key ,just-translate ,only-first
,ergoemacs-translation-from ,ergoemacs-translation-to)
ergoemacs-kbd-hash)))
(if new-key
- (symbol-value 'new-key)
+ new-key
(setq new-key key)
(cond
((eq system-type 'windows-nt)
@@ -998,7 +998,7 @@ For example, on dvorak, change C-j to C-c (copy/command)."
"[Cc]\\(?:on\\)?tro?l[+-]" "C-"
(replace-regexp-in-string
"[Aa]lt[+-]" "M-" pre-kbd-code))))
- (symbol-value 'ret)))
+ ret))
(defun ergoemacs-key-fn-lookup (function &optional use-apps)
"Looks up the key binding for FUNCTION based on.
@@ -1017,7 +1017,7 @@ Based on `ergoemacs-with-ergoemacs'"
(while (and ret (not (eq (elt (nth 0 ret) 0) 'apps)))
(pop ret)))
(setq ret (nth 0 ret))
- (symbol-value 'ret))))
+ ret)))
(provide 'ergoemacs-translate)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/ergoemacs-unbind.el b/ergoemacs-unbind.el
index 5da30c2..1b610d8 100644
--- a/ergoemacs-unbind.el
+++ b/ergoemacs-unbind.el
@@ -900,7 +900,7 @@ This should only be run when no global keys have been set.
(ergoemacs-global-fix-defualt-bindings key-kbd
trans-function))))
(add-to-list 'ergoemacs-global-changed-cache key-kbd))
(add-to-list 'ergoemacs-global-not-changed-cache key-kbd))
- (symbol-value 'has-changed)))))))
+ has-changed))))))
(defun ergoemacs-warn-globally-changed-keys (&optional fix)
"Warns about globally changed keys. If FIX is true, fix the ergoemacs-unbind
file."
- [elpa] 07/287: Gitignore change., (continued)
- [elpa] 07/287: Gitignore change., Matthew Fidler, 2014/07/02
- [elpa] 08/287: Move ergoemacs-advices, Matthew Fidler, 2014/07/02
- [elpa] 11/287: No longer wrap in unwind-protect, Matthew Fidler, 2014/07/02
- [elpa] 09/287: Took out unknown signatory advice :(. Cleaned up advices., Matthew Fidler, 2014/07/02
- [elpa] 10/287: Took out usless argument to ergoemacs-global-set-key-after, Matthew Fidler, 2014/07/02
- [elpa] 13/287: Activate advices in definitions., Matthew Fidler, 2014/07/02
- [elpa] 14/287: Fix `ergoemacs-populate-pre-command-hook', Matthew Fidler, 2014/07/02
- [elpa] 12/287: no-ergoemacs-advice -> ergoemacs-ignore-advice, Matthew Fidler, 2014/07/02
- [elpa] 15/287: Use strinp consp and vectorp, Matthew Fidler, 2014/07/02
- [elpa] 18/287: Load ergoemacs-test for clean ergoemacs-mode load., Matthew Fidler, 2014/07/02
- [elpa] 06/287: Don't use symbol-value,
Matthew Fidler <=
- [elpa] 16/287: ergoemacs--key-message, Matthew Fidler, 2014/07/02
- [elpa] 17/287: fix some let bindings., Matthew Fidler, 2014/07/02
- [elpa] 20/287: Add requires for byte-compile, Matthew Fidler, 2014/07/02
- [elpa] 21/287: Remove unused ergoemacs-define-key, Matthew Fidler, 2014/07/02
- [elpa] 22/287: Some cleanups for ergoemacs-setup-translation, Matthew Fidler, 2014/07/02
- [elpa] 19/287: Added `ergoemacs-read-key--echo-command`, Matthew Fidler, 2014/07/02
- [elpa] 24/287: Revert ergoemacs-translate, Matthew Fidler, 2014/07/02
- [elpa] 26/287: Fix ergoemacs-extras Issue #225., Matthew Fidler, 2014/07/02
- [elpa] 27/287: Added cl require for ergoemacs-functions (Issue #225)., Matthew Fidler, 2014/07/02
- [elpa] 28/287: Merge branch 'master' into eieio, Matthew Fidler, 2014/07/02