diff options
author | Pierre Courtieu <Pierre.Courtieu@cnam.fr> | 2017-01-26 11:32:46 +0100 |
---|---|---|
committer | Pierre Courtieu <Pierre.Courtieu@cnam.fr> | 2017-01-26 11:32:46 +0100 |
commit | cf290f2da6513c42ad57620136c7e6b6cebf8e11 (patch) | |
tree | b1114d17e8c507bae32520851b468d1ac4770232 /generic/proof-tree.el | |
parent | c6e44de22de8dfe7a5c9521201937a8302ec12c9 (diff) | |
parent | 4bcac92df46da9e68b5e3d565bb118fb63b4feb4 (diff) |
Merge branch 'master' of github.com:ProofGeneral/PG into master_origin
Diffstat (limited to 'generic/proof-tree.el')
-rw-r--r-- | generic/proof-tree.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/generic/proof-tree.el b/generic/proof-tree.el index 77d3cc33..f0894656 100644 --- a/generic/proof-tree.el +++ b/generic/proof-tree.el @@ -842,13 +842,14 @@ The not yet delayed output is in the region (start proof-shell-delayed-output-start) (end proof-shell-delayed-output-end) inst-ex-vars) - (when (and (not (memq 'proof-tree-show-subgoal flags)) - (> state proof-tree-last-state)) - ;; Only deal with existentials if the proof assistant has them - ;; (i.e., proof-tree-existential-regexp is set) and if there are some - ;; goals with existentials. - (when (and proof-tree-existential-regexp + (unless (memq 'proof-tree-show-subgoal flags) + (when (and (> state proof-tree-last-state) + proof-tree-existential-regexp proof-tree-existentials-alist) + ;; Only deal with existentials if this is not and undo + ;; command, if the proof assistant actually has existentials + ;; (i.e., proof-tree-existential-regexp is set) and if there + ;; are some goals with existentials. (setq inst-ex-vars (with-current-buffer proof-shell-buffer (funcall proof-tree-extract-instantiated-existentials |