Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv29736
Modified Files: commands.lisp Log Message: `Lookup-keystroke-item' does not take an :errorp argument according to the spec. And if we really want it to, it should be NIL by default.
--- /project/mcclim/cvsroot/mcclim/commands.lisp 2006/05/12 10:24:32 1.63 +++ /project/mcclim/cvsroot/mcclim/commands.lisp 2006/09/17 20:34:39 1.64 @@ -481,8 +481,7 @@ nil)))
(defun lookup-keystroke-item (gesture command-table - &key (test #'event-matches-gesture-name-p) - (errorp t)) + &key (test #'event-matches-gesture-name-p)) (let ((command-table (find-command-table command-table))) (multiple-value-bind (item table) (find-keystroke-item gesture command-table :test test :errorp nil) @@ -495,15 +494,11 @@ (multiple-value-bind (sub-item sub-command-table) (lookup-keystroke-item gesture (command-menu-item-value item) - :test test - :errorp nil) + :test test) (when sub-command-table (return-from lookup-keystroke-item (values sub-item sub-command-table)))))) - command-table)) - (if errorp - (error 'command-not-present) - nil))) + command-table))))
(defun partial-command-from-name (command-name) (let ((parser (gethash command-name *command-parser-table*))) @@ -1369,7 +1364,8 @@ (let ((command (lookup-keystroke-command-item (accelerator-gesture-event c) command-table))) - (if (partial-command-p command) + (if (and (listp command) + (partial-command-p command)) (funcall *partial-command-parser* command-table stream command (position *unsupplied-argument-marker* command))