branch: externals/ergoemacs-mode
commit 081fcbd911ca3e360fdca492736892c041867c51
Author: Matthew Fidler <[email protected]>
Commit: Matthew Fidler <[email protected]>
Fix #503
---
ergoemacs-command-loop.el | 4 ++--
ergoemacs-mode.el | 18 +++++++++---------
ergoemacs-test.el | 3 ++-
ergoemacs-translate.el | 2 +-
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 697f62d..3213c8e 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -107,7 +107,7 @@
(defvar ergoemacs-command-loop--mark-active nil
"Determines if mark was active before ergoemacs command loop.")
-(define-obsolete-variable-alias 'ergoemacs-universal-fns
'ergoemacs-command-loop--universal-functions)
+(define-obsolete-variable-alias 'ergoemacs-universal-fns
'ergoemacs-command-loop--universal-functions "Ergoemacs-v5.16")
(defvar ergoemacs-command-loop--universal-functions '(universal-argument
ergoemacs-universal-argument ergoemacs-command-loop--universal-argument)
@@ -132,7 +132,7 @@
(defvar ergoemacs-command-loop--help-last-key nil)
-(define-obsolete-variable-alias 'ergoemacs-read-key-delay
'ergoemacs-command-loop--decode-event-delay)
+(define-obsolete-variable-alias 'ergoemacs-read-key-delay
'ergoemacs-command-loop--decode-event-delay "Ergoemacs-v5.16")
(defvar ergoemacs-command-loop--decode-event-delay 0.01
"Timeout for `ergoemacs-command-loop--decode-event'.
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 6747029..96db5de 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -848,7 +848,7 @@ Valid values are:
"Display Options for `ergoemacs-mode'."
:group 'ergoemacs-mode)
-(define-obsolete-variable-alias 'ergoemacs-use-unicode-char
'ergoemacs-display-unicode-characters)
+(define-obsolete-variable-alias 'ergoemacs-use-unicode-char
'ergoemacs-display-unicode-characters "Ergoemacs-v5.16")
(defcustom ergoemacs-display-unicode-characters t
"Use unicode characters when available."
@@ -866,7 +866,7 @@ Valid values are:
:initialize #'custom-initialize-default
:group 'ergoemacs-display)
-(define-obsolete-variable-alias 'ergoemacs-use-unicode-brackets
'ergoemacs-display-use-unicode-brackets-around-keys)
+(define-obsolete-variable-alias 'ergoemacs-use-unicode-brackets
'ergoemacs-display-use-unicode-brackets-around-keys "Ergoemacs-v5.16")
(defcustom ergoemacs-display-use-unicode-brackets-around-keys t
"Use unicode brackets."
@@ -875,7 +875,7 @@ Valid values are:
:initialize #'custom-initialize-default
:group 'ergoemacs-display)
-(define-obsolete-variable-alias 'ergoemacs-use-small-symbols
'ergoemacs-display-small-symbols-for-key-modifiers)
+(define-obsolete-variable-alias 'ergoemacs-use-small-symbols
'ergoemacs-display-small-symbols-for-key-modifiers "Ergoemacs-v5.16")
(defcustom ergoemacs-display-small-symbols-for-key-modifiers nil
"Use small symbols to represent alt+ ctl+ on windows/linux."
@@ -884,7 +884,7 @@ Valid values are:
:initialize #'custom-initialize-default
:group 'ergoemacs-display)
-(define-obsolete-variable-alias 'ergoemacs-capitalize-keys
'ergoemacs-display-capitalize-keys)
+(define-obsolete-variable-alias 'ergoemacs-capitalize-keys
'ergoemacs-display-capitalize-keys "Ergoemacs-v5.16")
(defcustom ergoemacs-display-capitalize-keys 'with-modifiers
"Capitalize keys like Ctrl+C.
@@ -897,7 +897,7 @@ Valid values are:
:initialize #'custom-initialize-default
:group 'ergoemacs-display)
-(define-obsolete-variable-alias 'ergoemacs-pretty-key-use-face
'ergoemacs-display-key-use-face-p)
+(define-obsolete-variable-alias 'ergoemacs-pretty-key-use-face
'ergoemacs-display-key-use-face-p "Ergoemacs-v5.16")
(defcustom ergoemacs-display-key-use-face-p t
"Use a button face for keys."
@@ -953,7 +953,7 @@ Valid values are:
"Options for `ergoemacs-command-loop'."
:group 'ergoemacs-mode)
-(define-obsolete-variable-alias 'ergoemacs-read-blink
'ergoemacs-command-loop-blink-character)
+(define-obsolete-variable-alias 'ergoemacs-read-blink
'ergoemacs-command-loop-blink-character "Ergoemacs-v5.16")
(defcustom ergoemacs-command-loop-blink-character (ergoemacs :unicode-or-alt
"•" "·" "-")
"Blink character."
@@ -962,14 +962,14 @@ Valid values are:
(const :tag "No cursor" nil))
:group 'ergoemacs-command-loop)
-(define-obsolete-variable-alias 'ergoemacs-read-blink-timeout
'ergoemacs-command-loop-blink-rate)
+(define-obsolete-variable-alias 'ergoemacs-read-blink-timeout
'ergoemacs-command-loop-blink-rate "Ergoemacs-v5.16")
(defcustom ergoemacs-command-loop-blink-rate 0.4
"Rate that the ergoemacs-command loop cursor blinks."
:type 'number
:group 'ergoemacs-command-loop)
-(define-obsolete-variable-alias 'ergoemacs-read-swaps
'ergoemacs-command-loop-swap-translation)
+(define-obsolete-variable-alias 'ergoemacs-read-swaps
'ergoemacs-command-loop-swap-translation "Ergoemacs-v5.16")
(defcustom ergoemacs-command-loop-swap-translation
'(((:normal :normal) :unchorded-ctl)
@@ -1031,7 +1031,7 @@ Valid values are:
:type '(repeat string)
:group 'ergoemacs-modal)
-(define-obsolete-variable-alias 'ergoemacs-default-cursor
'ergoemacs-default-cursor-color)
+(define-obsolete-variable-alias 'ergoemacs-default-cursor
'ergoemacs-default-cursor-color "Ergoemacs-v5.16")
(defcustom ergoemacs-default-cursor-color nil
"Default cursor color.
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index 01318cc..912ba25 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -588,7 +588,8 @@ not using cua or cutting line. I think kill-region is what
is meant."
(insert ergoemacs-test-lorem-ipsum)
(fundamental-mode)
(should (or (eq (key-binding (kbd "M-e")) 'backward-kill-word)
- (eq (key-binding (kbd "M-e")) (command-remapping
'backward-kill-word (point)))))
+ (eq (key-binding (kbd "M-e"))
+ (command-remapping 'backward-kill-word (point)))))
(setq ergoemacs-test-fn nil)
(goto-char (point-max))
(execute-kbd-macro macro)
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index 387486d..cbb1dc6 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -751,7 +751,7 @@ When NAME is a symbol, setup the translation function for
the symbol."
,(concat "Ergoemacs local map for translation :"
name-str
" while completing a key sequence."))
- (define-obsolete-variable-alias ',(intern (concat "ergoemacs-"
name-str "-translation-local-map"))
+ (define-obsolete-variable-alias ',(intern (concat "ergoemacs-"
name-str "-translation-local-map") "Ergoemacs-v5.16")
',(intern (concat "ergoemacs-translate--" name-str "-map"))))))
(ergoemacs-map-properties--label-map (intern (concat
"ergoemacs-translate--" name-str "-map")) t)
(ergoemacs (symbol-value (intern (concat "ergoemacs-translate--"
name-str "-map"))) :only-local-modifications-p t)
