emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ergoemacs-mode 3d61040 220/325: Remove ergoemacs-layout


From: Stefan Monnier
Subject: [elpa] externals/ergoemacs-mode 3d61040 220/325: Remove ergoemacs-layouts--no-aliases
Date: Sat, 23 Oct 2021 18:48:57 -0400 (EDT)

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

    Remove ergoemacs-layouts--no-aliases
---
 ergoemacs-command-loop.el | 2 --
 ergoemacs-component.el    | 2 --
 ergoemacs-layouts.el      | 9 ++-------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 2ebec84..e62a01a 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -43,8 +43,6 @@
 
 (declare-function ergoemacs-mode-line "ergoemacs-mode")
 
-(declare-function ergoemacs-layouts--list "ergoemacs-layouts")
-
 (declare-function ergoemacs-map-properties--movement-p 
"ergoemacs-map-properties")
 (declare-function ergoemacs-map-properties--put "ergoemacs-map-properties")
 
diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index 56662ef..f802214 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -87,8 +87,6 @@
 
 (declare-function ergoemacs-key-description "ergoemacs-key-description")
 (declare-function ergoemacs-layout--regexp "ergoemacs-layouts")
-(declare-function ergoemacs-layouts--list "ergoemacs-layouts")
-
 
 ;; ergoemacs-translate
 
diff --git a/ergoemacs-layouts.el b/ergoemacs-layouts.el
index ae16223..9b69ffb 100644
--- a/ergoemacs-layouts.el
+++ b/ergoemacs-layouts.el
@@ -429,13 +429,11 @@ file."
            (concat "\"" lay "\" (" doc ")" (if is-alias ", alias" "")))))
      lays "\n")))
 
-(defvar ergoemacs-layouts--no-aliases nil)
 (defvar ergoemacs-layouts--aliases nil)
 
 (defun ergoemacs-layouts--reset ()
   "Reset Layout information."
   (interactive)
-  (setq ergoemacs-layouts--no-aliases nil)
   (setq ergoemacs-layouts--aliases nil))
 
 (defun ergoemacs-layouts--list (&optional aliases ob)
@@ -444,9 +442,6 @@ file."
 When ALIASES is non-nil, list aliases and actuval variables.
 
 OB is the object array."
-  (if (and ergoemacs-layouts--no-aliases
-           (not aliases))
-      ergoemacs-layouts--no-aliases
     (if (and ergoemacs-layouts--aliases
              aliases)
         ergoemacs-layouts--aliases
@@ -464,8 +459,8 @@ OB is the object array."
          ob)
         (if aliases
             (setq ergoemacs-layouts--aliases nil)
-          (setq ergoemacs-layouts--no-aliases nil))
-        ret))))
+          )
+        ret)))
 
 (defun ergoemacs-layout (layout)
   "Set the ergoemacs layout to LAYOUT."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]