[elpa] 07/117: Lexical scoping for ergoemacs-menus

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit 0312e5eec12d3d3da84d826fdc934bf8ac2bf91a
Author: Matthew L. Fidler <address@hidden>
Date:   Mon Jul 14 08:43:11 2014 -0500

    Lexical scoping for ergoemacs-menus
---
 ergoemacs-menus.el |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ergoemacs-menus.el b/ergoemacs-menus.el
index 29a5de0..fcc8183 100644
--- a/ergoemacs-menus.el
+++ b/ergoemacs-menus.el
@@ -1,4 +1,4 @@
-;;; ergoemacs-menus.el --- toggle ErgoEmacs-style menus
+;;; ergoemacs-menus.el --- toggle ErgoEmacs-style menus -*- lexical-binding: t 
-*-
 
 ;; Copyright (C) 2013, 2014 Free Software Foundation, Inc.
 
@@ -152,16 +152,17 @@
            (text :tag "Alternative Description:")))
   :group 'ergoemacs-mode)
 
-(defun ergoemacs-get-major-mode-name (major-mode)
-  "Gets the major-mode language name.
+
+(defun ergoemacs-get-major-mode-name (mode)
+  "Gets the MODE language name.
 Tries to get the value from `ergoemacs-mode-names'.  If not guess the language 
name."
-  (let ((ret (assoc major-mode ergoemacs-mode-names)))
+  (let ((ret (assoc mode ergoemacs-mode-names)))
     (if (not ret)
         (setq ret (replace-regexp-in-string
                    "-" " "
                    (replace-regexp-in-string
                     "-mode" ""
-                    (symbol-name major-mode))))
+                    (symbol-name mode))))
       (setq ret (car (cdr ret))))
     (setq ret (concat (upcase (substring ret 0 1))
                       (substring ret 1)))
@@ -180,7 +181,7 @@ All other modes are assumed to be minor modes or 
unimportant.
 "
   ;; Get known major modes
   (let ((ret '())
-        all dups cur-let cur-lst current-letter
+        all dups cur-lst current-letter
         added-modes
         (modes '()))
     (dolist (elt (append
@@ -190,9 +191,7 @@ All other modes are assumed to be minor modes or 
unimportant.
                   auto-mode-alist))
       (unless (memq (cdr elt) modes)
         (when (and (functionp (cdr elt))
-                   (string-match "-mode$" (condition-case err
-                                              (symbol-name (cdr elt))
-                                            (error ""))))
+                   (ignore-errors (string-match "-mode$" (symbol-name (cdr 
elt)))))
           (unless (or (memq (cdr elt) ergoemacs-excluded-major-modes)
                       (member (downcase (symbol-name (cdr elt))) added-modes))
             (let* ((name (ergoemacs-get-major-mode-name (cdr elt)))