Enable lexical bindings

Author: nonsequitur

smex.el

@@ -1,4 +1,4 @@
-;;; smex.el --- M-x interface with Ido-style fuzzy matching.
+;;; smex.el --- M-x interface with Ido-style fuzzy matching. -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2009-2014 Cornelius Mika and contributors
 ;;
@@ -268,17 +268,20 @@ Set this to nil to disable fuzzy matching."
   "Updates `smex-history'"
   (setq smex-history nil)
   (let ((cell smex-cache))
-    (dotimes (i smex-history-length)
+    (dotimes (_ smex-history-length)
       (setq smex-history (cons (caar cell) smex-history))
       (setq cell (cdr cell))))
   (setq smex-history (nreverse smex-history)))
 
+(defmacro smex-pp (list-var)
+  `(smex-pp* ,list-var ,(symbol-name list-var)))
+
 (defun smex-save-to-file ()
   (interactive)
   (smex-save-history)
   (with-temp-file (expand-file-name smex-save-file)
-    (ido-pp 'smex-history)
-    (ido-pp 'smex-data)))
+    (smex-pp smex-history)
+    (smex-pp smex-data)))
 
 ;;--------------------------------------------------------------------------------
 ;; Ranking
@@ -340,8 +343,7 @@ Set this to nil to disable fuzzy matching."
 (defun smex-sort-item-at (n)
   "Sorts item at position N in `smex-cache'."
   (let* ((command-cell (nthcdr n smex-cache))
-         (command-item (car command-cell))
-         (command-count (cdr command-item)))
+         (command-item (car command-cell)))
     (let ((insert-at (smex-detect-position
                       command-cell
                       (lambda (cell)
@@ -412,7 +414,7 @@ Returns nil when reaching the end of the list."
     commands))
 
 (defun smex-parse-keymap (map commands)
-  (map-keymap (lambda (binding element)
+  (map-keymap (lambda (_binding element)
                 (if (and (listp element) (eq 'keymap (car element)))
                     (smex-parse-keymap element commands)
                   ;; Strings are commands, too. Reject them.
@@ -457,9 +459,25 @@ sorted by frequency of use."
     (setq buffer-read-only t)
     (let ((inhibit-read-only t))
       (erase-buffer)
-      (ido-pp 'unbound-commands))
+      (smex-pp unbound-commands))
     (set-buffer-modified-p nil)
     (goto-char (point-min))))
 
+;; A copy of `ido-pp' that's compatible with lexical bindings
+(defun smex-pp* (list list-name)
+  (let ((print-level nil) (eval-expression-print-level nil)
+        (print-length nil) (eval-expression-print-length nil))
+    (insert "\n;; ----- " list-name " -----\n(\n ")
+    (while list
+      (let* ((elt (car list))
+             (s (if (consp elt) (car elt) elt)))
+        (if (and (stringp s) (= (length s) 0))
+            (setq s nil))
+        (if s
+            (prin1 elt (current-buffer)))
+        (if (and (setq list (cdr list)) s)
+            (insert "\n "))))
+    (insert "\n)\n")))
+
 (provide 'smex)
 ;;; smex.el ends here