branch: externals/ergoemacs-mode
commit ad3ec45ebbfdfaca052253c550102fd665b3bd1b
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Fix describe-ergoemacs-theme and consolidate menu items
---
ergoemacs-functions.el | 7 -------
ergoemacs-key-description.el | 6 +++++-
ergoemacs-theme-engine.el | 10 +++++-----
ergoemacs-themes.el | 11 -----------
4 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 62669c9..5c46645 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -61,7 +61,6 @@
(declare-function cua-cut-region "cua-base")
(declare-function cua-paste "cua-base")
(declare-function cua-set-rectangle-mark "cua-rect")
-(declare-function describe-ergoemacs-theme "ergoemacs-theme-engine")
(declare-function dired-get-marked-files "dired")
(declare-function ergoemacs-map-- "ergoemacs-map")
@@ -2343,12 +2342,6 @@ If arg is a negative prefix, copy file path only"
:type 'string
:group 'ergoemacs-mode)
-(defun ergoemacs-display-current-theme ()
- "Generates the current ergoemacs layout, unless it already
-exists and opens it in emacs, if possible."
- (interactive)
- (describe-ergoemacs-theme ergoemacs-theme))
-
;;; Unaccent region taken and modified from Drew Adam's unaccent.el
(require 'strings nil t) ;; (no error if not found): region-description
diff --git a/ergoemacs-key-description.el b/ergoemacs-key-description.el
index 5d304f6..b910a73 100644
--- a/ergoemacs-key-description.el
+++ b/ergoemacs-key-description.el
@@ -197,7 +197,11 @@ MOD ar the modifiers applied to the key."
(when (and ergoemacs-display-key-use-face-p
(not ergoemacs-display-small-symbols-for-key-modifiers))
(add-text-properties 0 (length ret)
- '(face ergoemacs-display-key-face) ret))
+ '(face ergoemacs-display-key-face)
+ ;; Need to make a copy of ret because the
+ ;; (length ret) call makes it sometimes
+ ;; immutable
+ (copy-sequence ret)))
ret))
(defun ergoemacs-key-description--modifier (mod)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 3ecdd73..e5c54f9 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -422,9 +422,7 @@ When AT-END is non-nil, append a $ to the regular
expression."
(ergoemacs-sep-menu "--")
(ergoemacs-cheat
menu-item "Generate/Open Key binding Cheat Sheet"
- (lambda()
- (interactive)
- (call-interactively 'ergoemacs-display-current-theme)))
+ ergoemacs-describe-current-theme)
(ergoemacs-save
menu-item "Save Settings for Future Sessions"
@@ -443,6 +441,10 @@ When AT-END is non-nil, append a $ to the regular
expression."
(lambda ()
(interactive)
(customize-group 'ergoemacs-mode)))
+ (ergoemacs-mode-web-page
+ menu-item "Ergoemacs-mode web-page"
+ (lambda() (interactive)
+ (browse-url ergoemacs-mode-web-page-url)))
(ergoemacs-mode-exit
menu-item "Exit ergoemacs-mode"
(lambda() (interactive) (ergoemacs-mode -1)))))
@@ -630,8 +632,6 @@ See also `find-function-recenter-line' and
`find-function-after-hook'."
(ergoemacs-mode-reset)))
(buffer-string))))))
-(defalias 'describe-ergoemacs-theme 'ergoemacs-theme-describe)
-
(defvar ergoemacs-theme-create-bash-functions
'((backward-char)
(forward-char)
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index c9935ce..0763a2a 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -1864,17 +1864,6 @@
(man-dir menu-item "Unix Man Pages..."
woman
:help "Unix Manual entries
(with WoMan)")))
- (separator-2 menu-item "--")
-
- (eroemacs-current-keybindings menu-item
- "Current Ergoemacs
Keybindings"
-
ergoemacs-describe-current-theme)
-
- (ergoemacs-mode-web-page menu-item
- "Ergoemacs-mode web-page"
- (lambda() (interactive)
- (browse-url
ergoemacs-mode-web-page-url))
- :help "Online help about
ergoemacs.")
(separator-3 menu-item "--")
(send-bug-report menu-item "Send Emacs Bug Report"
