Commit a6363fc5 authored by Gail Zacharias's avatar Gail Zacharias

Get rid of *grovelling-for-arglist* now that can do it more cleanly

parent 76581535
...@@ -1326,13 +1326,7 @@ to the context provided by RAW-FORM." ...@@ -1326,13 +1326,7 @@ to the context provided by RAW-FORM."
;; This might be useful further down. ;; This might be useful further down.
(defvar *form-with-arglist*) (defvar *form-with-arglist*)
;; There are two different paths which call find-subform-with-arglist. We (defun find-subform-with-arglist (form &key for-completion?)
;; want to know which one we're on and we do this by binding
;; *grovelling-for-arglist*.
(defvar *grovelling-for-arglist* nil)
(defun find-subform-with-arglist (form)
"Returns four values: "Returns four values:
The appropriate subform of `form' which is closest to the The appropriate subform of `form' which is closest to the
...@@ -1405,7 +1399,7 @@ to the context provided by RAW-FORM." ...@@ -1405,7 +1399,7 @@ to the context provided by RAW-FORM."
(grovel-form form '())))) (grovel-form form '()))))
(handling-whatever () (handling-whatever ()
(let ((*form-with-arglist* form)) (let ((*form-with-arglist* form))
(if (and *grovelling-for-arglist* (if (and for-completion?
(eq (car form) 'gendl:define-object)) (eq (car form) 'gendl:define-object))
(find-define-object-subform form #'punt) (find-define-object-subform form #'punt)
(punt form)))))) (punt form))))))
...@@ -1500,8 +1494,7 @@ returned in that case." ...@@ -1500,8 +1494,7 @@ returned in that case."
(when (and (arglist-p argl) (listp args)) (when (and (arglist-p argl) (listp args))
(values argl args))))) (values argl args)))))
(multiple-value-bind (form arglist obj form-path) (multiple-value-bind (form arglist obj form-path)
(let ((*grovelling-for-arglist* t)) (find-subform-with-arglist form :for-completion? t)
(find-subform-with-arglist form))
(declare (ignore obj)) (declare (ignore obj))
(with-available-arglist (arglist) arglist (with-available-arglist (arglist) arglist
;; First try the form the cursor is in (in case of a normal ;; First try the form the cursor is in (in case of a normal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment