[elpa] externals/ergoemacs-mode 9cd2f3b 193/325: Always display unicode characters

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit 9cd2f3b479caa5287a716cd4c4760f7086a0f384
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Always display unicode characters
---
 ergoemacs-key-description.el | 4 +---
 ergoemacs-mode.el            | 7 -------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ergoemacs-key-description.el b/ergoemacs-key-description.el
index b91fd8b..4162b25 100644
--- a/ergoemacs-key-description.el
+++ b/ergoemacs-key-description.el
@@ -49,7 +49,6 @@
 (require 'help-mode)
 
 (defvar ergoemacs-use-unicode-symbols)
-(defvar ergoemacs-display-unicode-characters)
 (defvar ergoemacs-display-capitalize-keys)
 (defvar ergoemacs-display-key-use-face-p)
 (defvar ergoemacs-display-small-symbols-for-key-modifiers)
@@ -116,8 +115,7 @@
   "Return CHAR if it can be displayed, otherwise use ALT-CHAR.
 This assumes `ergoemacs-display-unicode-characters' is non-nil.  When
 `ergoemacs-display-unicode-characters' is nil display ALT-CHAR"
-  (if (and ergoemacs-display-unicode-characters
-           (ergoemacs-key-description--display-char-p char))
+  (if (ergoemacs-key-description--display-char-p char)
       char
     alt-char))
 
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 5dbb1db..d91cd9d 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -751,13 +751,6 @@ Valid values are:
   "Display Options for `ergoemacs-mode'."
   :group 'ergoemacs-mode)
 
-(defcustom ergoemacs-display-unicode-characters t
-  "Use unicode characters when available."
-  :type 'boolean
-  :set #'ergoemacs-set-default
-  :initialize #'custom-initialize-default
-  :group 'ergoemacs-display)
-
 (defcustom ergoemacs-display-ergoemacs-key-descriptions t
   "Use ergoemacs key descriptions (Alt+)."
   :type 'boolean