Update of /project/climacs/cvsroot/esa In directory clnet:/tmp/cvs-serv9089

Modified Files: esa.lisp Log Message: Fix esa describe-bindings.

--- /project/climacs/cvsroot/esa/esa.lisp 2006/05/04 08:06:29 1.10 +++ /project/climacs/cvsroot/esa/esa.lisp 2006/05/04 08:08:36 1.11 @@ -610,7 +610,10 @@ results))

(defun sort-by-name (list) - (sort list #'string< :key (lambda (item) (symbol-name (second item))))) + (sort list #'string< :key (lambda (item) + (symbol-name (if (listp (cdr item)) + (cadr item) + (cdr item))))))

(defun sort-by-keystrokes (list) (sort list (lambda (a b) @@ -628,10 +631,11 @@ (defun describe-bindings (stream command-table &optional (sort-function #'sort-by-name)) (formatting-table (stream) - (loop for (keys command) + (loop for (keys . command) in (funcall sort-function (find-all-keystrokes-and-commands-with-inheritance command-table)) + when (consp command) do (setq command (car command)) do (formatting-row (stream) (formatting-cell (stream :align-x :right) (with-text-style (stream '(:sans-serif nil nil))