aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Pierre Courtieu <courtieu@lri.fr>2014-12-09 10:50:00 +0000
committerGravatar Pierre Courtieu <courtieu@lri.fr>2014-12-09 10:50:00 +0000
commit3bd1b0b9301322f89057deb9eccd746b075b1694 (patch)
tree3b4fc2914929b3d8a7b8c0a9eaf80cdbb9bf6d0a
parent9b0462a9bb6a34df97515f7a64d4639a7960de0f (diff)
Added a variant of searchAbout hiding some spurious entries.
-rw-r--r--coq/coq-abbrev.el3
-rw-r--r--coq/coq.el20
2 files changed, 22 insertions, 1 deletions
diff --git a/coq/coq-abbrev.el b/coq/coq-abbrev.el
index 2dcead62..2ccf5cab 100644
--- a/coq/coq-abbrev.el
+++ b/coq/coq-abbrev.el
@@ -154,7 +154,8 @@
["About...(show all)" coq-About-with-all t]
["Search..." coq-SearchConstant t]
["SearchRewrite..." coq-SearchRewrite t]
- ["SearchAbout..." coq-SearchAbout t]
+ ["SearchAbout (hiding principles)..." coq-SearchAbout t]
+ ["SearchAbout..." coq-SearchAbout-all t]
["SearchPattern..." coq-SearchIsos t]
["Locate constant..." coq-LocateConstant t]
["Locate Library..." coq-LocateLibrary t]
diff --git a/coq/coq.el b/coq/coq.el
index e6c5e56c..c1d65594 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -776,6 +776,9 @@ More precisely it executes SETCMD, then DO id and finally silently UNSETCMD."
(defsubst coq-put-into-brackets (s)
(concat "[ " s " ]"))
+(defsubst coq-put-into-brackets-remove-useless (s)
+ (concat "[ " s " -\"ind\" - \"rect\" -\"rec\" ]"))
+
(defsubst coq-put-into-quotes (s)
(concat "\"" s "\""))
@@ -801,10 +804,25 @@ This is specific to `coq-mode'."
(interactive)
(coq-ask-do "SearchRewrite" "SearchRewrite" nil))
+;
+;(defun coq-SearchAbout (showall)
+; (interactive "P")
+; (coq-ask-do
+; "SearchAbout (ex: \"eq_\" eq -bool)"
+; "SearchAbout" nil (if showall 'coq-put-into-brackets 'coq-put-into-brackets-remove-useless)))
+;
+
(defun coq-SearchAbout ()
(interactive)
(coq-ask-do
"SearchAbout (ex: \"eq_\" eq -bool)"
+ "SearchAbout" nil 'coq-put-into-brackets-remove-useless)
+ (message "use `coq-SearchAbout-all' to see constants ending with \"ind\", \"rec\", etc"))
+
+(defun coq-SearchAbout-all ()
+ (interactive)
+ (coq-ask-do
+ "SearchAbout (ex: \"eq_\" eq -bool)"
"SearchAbout" nil 'coq-put-into-brackets))
(defun coq-Print (withprintingall)
@@ -1961,6 +1979,7 @@ Completion is on a quasi-exhaustive list of Coq tacticals."
(define-key coq-keymap [(control ?p)] 'coq-Print)
(define-key coq-keymap [(control ?b)] 'coq-About)
(define-key coq-keymap [(control ?a)] 'coq-SearchAbout)
+(define-key coq-keymap [(control shift ?a)] 'coq-SearchAbout-all)
(define-key coq-keymap [(control ?c)] 'coq-Check)
(define-key coq-keymap [?h] 'coq-PrintHint)
(define-key coq-keymap [(control ?l)] 'coq-LocateConstant)
@@ -1977,6 +1996,7 @@ Completion is on a quasi-exhaustive list of Coq tacticals."
(define-key coq-goals-mode-map [(control ?c)(control ?a)(control ?o)] 'coq-SearchIsos)
(define-key coq-goals-mode-map [(control ?c)(control ?a)(control ?b)] 'coq-About)
(define-key coq-goals-mode-map [(control ?c)(control ?a)(control ?a)] 'coq-SearchAbout)
+(define-key coq-goals-mode-map [(control ?c)(control ?a)(control shift ?a)] 'coq-SearchAbout-all)
(define-key coq-goals-mode-map [(control ?c)(control ?a)(control ?s)] 'coq-Show)
(define-key coq-goals-mode-map [(control ?c)(control ?a)?r] 'proof-store-response-win)
(define-key coq-goals-mode-map [(control ?c)(control ?a)?g] 'proof-store-goals-win)