1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
|
;;; pg-user.el --- User level commands for Proof General
;;
;; Copyright (C) 2000-2009 LFCS Edinburgh.
;; Author: David Aspinall and others
;; License: GPL (GNU GENERAL PUBLIC LICENSE)
;;
;; $Id$
;;
;;
;;; Commentary:
;;
;; This file defines some user-level commands. Most of them
;; are script-based operations. Exported user-level commands
;; are defined here as autoloads to avoid circular requires.
;;; Code:
(require 'span)
(require 'scomint)
(require 'proof-script) ; we build on proof-script
(eval-when-compile
(require 'cl)
(require 'completion)) ; loaded dynamically at runtime
; defined in proof-script/proof-setup-parsing-mechanism
(declare-function proof-segment-up-to "proof-script")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Utilities: moving point in proof script buffer
;;
(defun proof-script-next-command-advance ()
"Move point to the beginning of the next command if it's nearby.
Assumes that point is at the end of a command."
(interactive)
(skip-chars-forward " \t\n"))
; (if (and proof-one-command-per-line (eolp))
; (forward-line)))
;; First: two commands for moving forwards in proof scripts. Moving
;; forward for a "new" command may insert spaces or new lines. Moving
;; forward for the "next" command does not.
;;;###autoload
(defun proof-script-new-command-advance ()
"Move point to a nice position for a new command.
Assumes that point is at the end of a command."
(interactive)
; FIXME: pending improvement.2, needs a fix here.
; (if (eq (proof-locked-end) (point))
; ;; A hack to fix problem that the locked span
; ;; is [ ) so sometimes inserting at the end
; ;; tries to extend it, giving "read only" error.
; (if (> (point-max) (proof-locked-end))
; (progn
; (goto-char (1+ (proof-locked-end)))
; (backward-char))))
(if proof-one-command-per-line
;; One command per line: move to next new line, creating one if
;; at end of buffer or at the start of a blank line. (This has
;; the pleasing effect that blank regions of the buffer are
;; automatically extended when inserting new commands).
; unfortunately if we're not at the end of a line to start,
; it skips past stuff to the end of the line! don't want
; that.
; (cond
; ((eq (forward-line) 1)
; (newline))
; ((eolp)
; (newline)
; (forward-line -1)))
(newline)
;; Multiple commands per line: skip spaces at point, and insert
;; the 1/0 number of spaces that were skipped in front of point
;; (at least one). This has the pleasing effect that the spacing
;; policy of the current line is copied: e.g. <command>;
;; <command>; Tab columns don't work properly, however. Instead
;; of proof-one-command-per-line we could introduce a
;; "proof-command-separator" to improve this.
(let ((newspace (max (skip-chars-forward " \t") 1))
(p (point)))
(if proof-script-command-separator
(insert proof-script-command-separator)
(insert-char ?\040 newspace)
(goto-char p)))))
(defun proof-maybe-follow-locked-end (&optional pos)
"Move point according to `proof-follow-mode'.
If optional POS is set, use that position, else `proof-queue-or-locked-end'.
Assumes script buffer is current."
(if proof-follow-mode
(let ((dest (or pos (proof-queue-or-locked-end))))
(cond
((eq proof-follow-mode 'locked)
(goto-char dest)
(or pos (proof-script-next-command-advance)))
((eq proof-follow-mode 'follow)
(unless (pos-visible-in-window-p dest)
(let ((win (get-buffer-window (current-buffer) t)))
(if win
(set-window-point win dest)))))
((and (eq proof-follow-mode 'followdown)
(> dest (point)))
(goto-char dest))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Further movement commands
;;
;; TODO da: the next function is messy.
(defun proof-goto-command-start ()
"Move point to start of current (or final) command of the script."
(interactive)
(let* ((cmd (span-at (point) 'type))
(start (if cmd (span-start cmd))))
(if start
(progn
;; BUG: only works for unclosed proofs.
(goto-char start))
(let ((semis (nth 1 (proof-segment-up-to (point) t))))
(if (eq 'unclosed-comment (car-safe semis))
(setq semis (cdr-safe semis)))
(if (nth 2 semis) ; fetch end point of previous command
(goto-char (nth 2 semis))
;; no previous command: just next to end of locked
(goto-char (proof-locked-end)))))
;; Oddities of this function: if we're beyond the last proof
;; command, it jumps back to the last command. Could alter this
;; by spotting that command end of last of semis is before
;; point. Also, behaviour with comments is different depending
;; on whether locked or not.
(skip-chars-forward " \t\n")))
(defun proof-goto-command-end ()
"Set point to end of command at point."
(interactive)
(let ((cmd (span-at (point) 'type)))
(if cmd
(goto-char (span-end cmd))
(let ((semis (save-excursion
(proof-segment-up-to-using-cache (point)))))
(if semis
(progn
(goto-char (nth 2 (car semis)))
(skip-chars-backward " \t\n")
(unless (eq (point) (point-min))
(backward-char))))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Processing commands
;;
;;;###autoload
(defun proof-goto-point ()
"Assert or retract to the command at current position.
Calls `proof-assert-until-point' or `proof-retract-until-point' as
appropriate."
(interactive)
(save-excursion
(if (> (proof-queue-or-locked-end) (point))
(proof-retract-until-point)
(if (proof-only-whitespace-to-locked-region-p)
(progn
(skip-chars-forward " \t\n")
(forward-char 1)))
(proof-assert-until-point))))
(defun proof-assert-next-command-interactive ()
"Process until the end of the next unprocessed command after point.
If inside a comment, just process until the start of the comment."
(interactive)
(proof-with-script-buffer ; for toolbar/other buffers
(save-excursion
(goto-char (proof-queue-or-locked-end))
(skip-chars-forward " \t\n")
(proof-assert-until-point))
(proof-maybe-follow-locked-end)
(proof-script-next-command-advance)))
;; NB: "interactive" variant merely for a simple docstring.
(defun proof-assert-until-point-interactive ()
"Process the region from the end of the locked-region until point.
If inside a comment, just process until the start of the comment."
(interactive)
(proof-assert-until-point))
(defun proof-process-buffer ()
"Process the current (or script) buffer, and maybe move point to the end."
(interactive)
(proof-with-script-buffer
(save-excursion
(goto-char (point-max))
(proof-assert-until-point-interactive))
(proof-maybe-follow-locked-end)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Undoing commands
;;
(defun proof-undo-last-successful-command ()
"Undo last successful command at end of locked region."
(interactive)
(proof-undo-last-successful-command-1))
(defun proof-undo-and-delete-last-successful-command ()
"Undo and delete last successful command at end of locked region.
Useful if you typed completely the wrong command.
Also handy for proof by pointing, in case the last proof-by-pointing
command took the proof in a direction you don't like.
Notice that the deleted command is put into the Emacs kill ring, so
you can use the usual `yank' and similar commands to retrieve the
deleted text."
(interactive)
(proof-undo-last-successful-command-1 'delete))
; (proof-script-new-command-advance))
(defun proof-undo-last-successful-command-1 (&optional delete)
"Undo last successful command at end of locked region.
If optional DELETE is non-nil, the text is also deleted from
the proof script."
(interactive "P")
(proof-with-script-buffer
(let (lastspan)
(save-excursion
(unless (proof-locked-region-empty-p)
(if (setq lastspan (span-at-before (proof-locked-end) 'type))
(progn
(goto-char (span-start lastspan))
(proof-retract-until-point delete))
(error "Nothing to undo!"))))
(if lastspan (proof-maybe-follow-locked-end
(span-start lastspan))))))
(defun proof-retract-buffer ()
"Retract the current buffer, and maybe move point to the start."
(interactive)
(proof-with-script-buffer
(save-excursion
(goto-char (point-min))
(proof-retract-until-point-interactive))
(proof-maybe-follow-locked-end (point-min))))
(defun proof-retract-current-goal ()
"Retract the current proof, and move point to its start."
(interactive)
(let
((span (proof-last-goal-or-goalsave)))
(save-excursion
(if (and span (not (eq (span-property span 'type) 'goalsave))
(< (span-end span) (proof-unprocessed-begin)))
(progn
(goto-char (span-start span))
(proof-retract-until-point-interactive))
(error "Not proving")))
(if span (proof-maybe-follow-locked-end (span-start span)))))
;;
;; Mouse functions
;;
(defun proof-mouse-goto-point (event)
"Call `proof-goto-point' on the click position EVENT."
(interactive "e")
(proof-with-script-buffer
(mouse-set-point event)
(proof-goto-point)
(proof-maybe-follow-locked-end)))
;;
;; Minibuffer non-scripting command
;;
(defvar proof-minibuffer-history nil
"History of proof commands read from the minibuffer.")
(defun proof-minibuffer-cmd (cmd)
"Send CMD to proof assistant. Interactively, read from minibuffer.
The command isn't added to the locked region.
If a prefix arg is given and there is a selected region, that is
pasted into the command. This is handy for copying terms, etc from
the script.
If `proof-strict-state-preserving' is set, and `proof-state-preserving-p'
is configured, then the latter is used as a check that the command
will be safe to execute, in other words, that it won't ruin
synchronization. If when applied to the command it returns false,
then an error message is given.
WARNING: this command risks spoiling synchronization if the test
`proof-state-preserving-p' is not configured, if it is
only an approximate test, or if `proof-strict-state-preserving'
is off (nil)."
(interactive
(list (read-string "Command: "
(if (and current-prefix-arg (region-active-p))
(replace-regexp-in-string
"[ \t\n]+" " "
(buffer-substring (region-beginning) (region-end))))
'proof-minibuffer-history)))
(if (and proof-strict-state-preserving
proof-state-preserving-p
(not (funcall proof-state-preserving-p cmd)))
(error "Command is not state preserving, I won't execute it!"))
(proof-shell-invisible-command cmd))
;;
;; Frobbing locked end
;;
;; A command for making things go horribly wrong - it moves the
;; end-of-locked-region marker backwards, so user had better move it
;; correctly to sync with the proof state, or things will go all
;; pear-shaped.
;; In fact, it's so risky, we'll disable it by default
(put 'proof-frob-locked-end 'disabled t)
(defun proof-frob-locked-end ()
"Move the end of the locked region backwards to regain synchronization.
Only for use by consenting adults.
This command can be used to repair synchronization in case something
goes wrong and you want to tell Proof General that the proof assistant
has processed less of your script than Proof General thinks.
You should only use it to move the locked region to the end of
a proof command."
(interactive)
(cond
(proof-shell-busy
(error "You can't use this command while %s is busy!" proof-assistant))
((not (eq (current-buffer) proof-script-buffer))
(error "Must be in the active scripting buffer"))
;; Sometimes may need to move point forwards, when locked region
;; is editable.
;; ((> (point) (proof-locked-end))
;; (error "You can only move point backwards"))
;; FIXME da: should move to a command boundary, really!
(t (proof-set-locked-end (point))
(span-delete-spans (proof-locked-end) (point-max) 'type))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
;;; Non-scripting proof assistant commands.
;;;
;; These are based on defcustom'd settings so that users may
;; re-configure the system to their liking.
;; FIXME: da: add more general function for inserting into the
;; script buffer and the proof process together, and using
;; a choice of minibuffer prompting (hated by power users, perfect
;; for novices).
;; TODO:
;; Add named goals.
;; Coherent policy for movement here and elsewhere based on
;; proof-one-command-per-line user option.
;; Coherent policy for sending to process after writing into
;; script buffer. Could have one without the other.
;; For example, may be more easy to edit complex goal string
;; first in the script buffer. Ditto for tactics, etc.
;;
;; Helper macros and functions
;;
;; See put expression at end to give this indentation like while form
(defmacro proof-if-setting-configured (var &rest body)
"Give error if a configuration setting VAR is unset, otherwise eval BODY."
`(if ,var
(progn ,@body)
(error "Proof General not configured for this: set %s"
,(symbol-name var))))
;;;###autoload
(defmacro proof-define-assistant-command (fn doc cmdvar &optional body)
"Define FN (docstring DOC) to send BODY to prover, based on CMDVAR.
BODY defaults to CMDVAR, a variable."
`(defun ,fn ()
,(concat doc
(concat "\nIssues a command to the assistant based on "
(symbol-name cmdvar) ".")
"")
(interactive)
(proof-if-setting-configured ,cmdvar
(proof-shell-invisible-command ,(or body cmdvar)))))
;;;###autoload
(defmacro proof-define-assistant-command-witharg (fn doc cmdvar prompt &rest body)
"Define command FN to prompt for string CMDVAR to proof assistant.
CMDVAR is a variable holding a function or string. Automatically has history."
`(progn
(defvar ,(intern (concat (symbol-name fn) "-history")) nil
,(concat "History of arguments for " (symbol-name fn) "."))
(defun ,fn (arg)
,(concat doc "\nIssues a command based on ARG to the assistant, using "
(symbol-name cmdvar) ".\n"
"The user is prompted for an argument.")
(interactive
(proof-if-setting-configured ,cmdvar
(if (stringp ,cmdvar)
(list (format ,cmdvar
(read-string
,(concat prompt ": ") ""
,(intern (concat (symbol-name fn) "-history")))))
(funcall ,cmdvar))))
,@body)))
(defun proof-issue-new-command (cmd)
"Insert CMD into the script buffer and issue it to the proof assistant.
If point is in the locked region, move to the end of it first.
Start up the proof assistant if necessary."
(proof-with-script-buffer
(if (proof-shell-live-buffer)
(if (proof-in-locked-region-p)
(proof-goto-end-of-locked t)))
(proof-script-new-command-advance)
;; FIXME: fixup behaviour of undo here. Really want to temporarily
;; disable undo for insertion. but (buffer-disable-undo) trashes
;; whole undo list!
(insert cmd)
;; FIXME: could do proof-indent-line here, but let's wait until
;; indentation is fixed.
(goto-char
(proof-assert-until-point-interactive))
(proof-script-new-command-advance)))
;;
;; Commands which do not require a prompt and send an invisible
;; command.
;;
(proof-define-assistant-command proof-prf
"Show the current proof state."
proof-showproof-command
(progn
(pg-goals-buffers-hint)
proof-showproof-command))
(proof-define-assistant-command proof-ctxt
"Show the current context."
proof-context-command)
(proof-define-assistant-command proof-help
"Show a help or information message from the proof assistant.
Typically, a list of syntax of commands available."
proof-info-command)
(proof-define-assistant-command proof-cd
"Change directory to the default directory for the current buffer."
proof-shell-cd-cmd
(proof-format-filename proof-shell-cd-cmd
default-directory))
(defun proof-cd-sync ()
"If `proof-shell-cd-cmd' is set, do `proof-cd' and wait for prover ready.
This is intended as a value for `proof-activate-scripting-hook'"
;; The hook is set in proof-mode before proof-shell-cd-cmd may be set,
;; so we explicitly test it here.
(if proof-shell-cd-cmd
(progn
(proof-cd)
(proof-shell-wait))))
;;
;; Commands which require an argument, and maybe affect the script.
;;
(proof-define-assistant-command-witharg proof-find-theorems
"Search for items containing given constants."
proof-find-theorems-command
"Find theorems containing"
(proof-shell-invisible-command arg))
(proof-define-assistant-command-witharg proof-issue-goal
"Write a goal command in the script, prompting for the goal."
proof-goal-command
"Goal"
(let ((proof-one-command-per-line t)) ; Goals always start at a new line
(proof-issue-new-command arg)))
(proof-define-assistant-command-witharg proof-issue-save
"Write a save/qed command in the script, prompting for the theorem name."
proof-save-command
"Save as"
(let ((proof-one-command-per-line t)) ; Saves always start at a new line
(proof-issue-new-command arg)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Electric terminator mode
;;
;; NB: only relevant for provers with a "terminal char" which
;; terminates commands in proof scripts.
;; Register proof-electric-terminator as a minor mode.
(or (assq 'proof-electric-terminator-enable minor-mode-alist)
(setq minor-mode-alist
(append minor-mode-alist
(list '(proof-electric-terminator-enable
(concat " " proof-terminal-string))))))
;; This is a function called by custom-set property = proof-set-value.
;;;###autoload
(defun proof-electric-terminator-enable ()
"Make sure the modeline is updated to display new value for electric terminator."
;; TODO: probably even this isn't necessary
(force-mode-line-update))
(proof-deftoggle proof-electric-terminator-enable
proof-electric-terminator-toggle)
(defun proof-process-electric-terminator ()
"Insert the proof command terminator, and assert up to it.
This is a little bit clever with placement of semicolons, and will
try to avoid duplicating them in the buffer.
When used in the locked region (and so with strict read only off), it
always defaults to inserting a semi (nicer might be to parse for a
comment, and insert or skip to the next semi)."
(let ((mrk (point)) ins incomment)
(if (< mrk (proof-locked-end))
;; In locked region, just insert terminator without further ado
(insert proof-terminal-char)
(if (proof-only-whitespace-to-locked-region-p)
(error "There's nothing to do!"))
(skip-chars-backward " \t\n")
(if (not (= (char-after (point)) proof-terminal-char))
(progn
(forward-char) ;; immediately after command end.
(unless proof-electric-terminator-noterminator
(insert proof-terminal-string)
(setq ins t))))
(let* ((pos (point))
(semis
(save-excursion
(proof-segment-up-to-using-cache pos))))
(if (eq 'unclosed-comment (car semis))
(progn
(setq incomment t)
;; delete spurious char in comment
(if ins (backward-delete-char 1))
(goto-char mrk)
(insert proof-terminal-string))
(proof-assert-semis semis)
(proof-script-next-command-advance))))))
(defun proof-electric-terminator ()
"Insert the terminator, perhaps sending the command to the assistant.
If variable `proof-electric-terminator-enable' is non-nil, the command will be
sent to the assistant."
(interactive)
(if proof-electric-terminator-enable
(proof-process-electric-terminator)
(self-insert-command 1)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Completion based on <PA>-completion-table
;;
;; Requires completion.el package. Completion is usually
;; a hand-wavy thing, so we don't make any attempt to maintain
;; a precise completion table or anything.
;;
;; New in 3.2.
;;
(defun proof-add-completions ()
"Add completions from <PA>-completion-table to completion database.
Uses `add-completion' with a negative number of uses and ancient
last use time, to discourage saving these into the users database."
(interactive)
(require 'completion)
(mapcar (lambda (cmpl)
;; completion gives error in this case; trapping
;; the error here is tricky in FSF Emacs so duplicate
;; the test.
(if (>= (length cmpl) completion-min-length)
(add-completion cmpl -1000 0)))
(proof-ass completion-table)))
;; completion not autoloaded in GNU Emacs
(or (fboundp 'complete)
(autoload 'complete "completion"))
;; NB: completion table is expected to be set when proof-script
;; is loaded! Can call proof-script-add-completions if the table
;; is updated.
(unless noninteractive ; during compilation
(eval-after-load "completion"
'(proof-add-completions)))
(defun proof-script-complete (&optional arg)
"Like `complete' but case-fold-search set to proof-case-fold-search."
(interactive "*p")
(let ((case-fold-search proof-case-fold-search))
(complete arg)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Span manipulation
;;
(defun pg-copy-span-contents (span)
"Copy contents of SPAN to kill ring, sans surrounding whitespace."
(copy-region-as-kill
(save-excursion
(goto-char (span-start span))
(skip-chars-forward " \t\n")
(point))
(save-excursion
(goto-char (span-end span))
(skip-chars-backward " \t\n")
(point)))
(if (fboundp 'own-clipboard) ;; XEmacs function
(own-clipboard (car kill-ring))))
;; 3.3: these functions are experimental, in that they haven't
;; been rigorously tested. FIXME: they don't work well in GNU Emacs.
(defun pg-numth-span-higher-or-lower (span num &optional noerr)
"Find NUM'th span after/before SPAN. NUM is positive for after."
(unless (and span (<= (span-end span) (proof-unprocessed-begin)))
(if noerr
nil
(error "No processed region under point")))
(let ((downflag (> num 0))
(num (abs num))
nextspan)
(while (and (> num 0)
(setq nextspan (if downflag
(next-span span 'type)
(prev-span span 'type)))
(if downflag
;; If moving down, check we don't go beyond
;; end of processed region
(<= (span-end span) (proof-unprocessed-begin))
t))
(setq num (1- num))
(setq span nextspan))
(if (= num 0)
span
(if noerr
nil
(error "No region to move past")))))
(defun pg-control-span-of (span)
"Return the controlling span of SPAN, or SPAN itself."
(or (span-property span 'controlspan)
span))
;; Really a drag-and-drop interface for this would be nice.
(defun pg-move-span-contents (span num)
"Move SPAN up/downwards in the buffer, past NUM spans.
If NUM is negative, move upwards. Return new span."
;; TODO: maybe num arg is overkill, should only have 1?
(save-excursion
(let ((downflag (> num 0)) nextspan)
;; Always move a control span instead; it contains
;; children span which move together with it.
(setq span (pg-control-span-of span))
(setq nextspan (pg-numth-span-higher-or-lower span num))
;; We're going to move the span to before/after nextspan.
;; First make sure inserting there doesn't extend the span.
(if downflag
(span-set-property nextspan 'end-open t)
(span-set-property nextspan 'start-open t))
;; When we delete the span, we want to duplicate it
;; to recreate in the new position.
(span-set-property span 'duplicable 't)
;; TODO: this is faulty: moving span up gives children
;; list with single nil element. Hence liveness test
(mapc (lambda (s) (if (span-live-p s)
(span-set-property s 'duplicable 't)))
(span-property span 'children))
(let* ((start (span-start span))
(end (span-end span))
(contents (buffer-substring start end))
;; Locked end may move up when we delete
;; region: we'll make sure to reset it
;; again later, it shouldn't change.
;; NB: (rely on singlethreadedness here, so
;; lockedend doesn't move while in this code).
(lockedend (span-end proof-locked-span)))
(let ((inhibit-read-only t))
;; TODO: undo behaviour isn't quite right yet.
(undo-boundary)
(delete-region start end)
(let ((insertpos (if downflag
(span-end nextspan)
(span-start nextspan))))
(goto-char insertpos)
;; Let XEmacs duplicate extents as needed, then repair
;; their associations
(insert contents)
(let ((new-span
(span-at insertpos 'type)));should be one we deleted.
(span-set-property new-span 'children
(pg-fixup-children-spans
new-span insertpos (point)))
(span-set-end proof-locked-span lockedend)
(undo-boundary)
new-span)))))))
(defun pg-fixup-children-spans (new-parent start end)
(append
(span-mapcar-spans
(lambda (span)
(if (span-property span 'controlspan)
(progn
(span-set-property span 'controlspan new-parent)
(list span))))
start end 'type)))
(defun pg-move-region-down (&optional num)
"Move the region under point downwards in the buffer, past NUM spans."
(interactive "p")
(let ((span (span-at (point) 'type)))
(and span
(goto-char (span-start
(pg-move-span-contents span num)))
(skip-chars-forward " \t\n"))))
(defun pg-move-region-up (&optional num)
"Move the region under point upwards in the buffer, past NUM spans."
(interactive "p")
(pg-move-region-down (- num)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Dragging regions around
;;
;; FIXME: unfinished
;(defvar pg-drag-region-point nil
; "Temporary store of point being dragged.")
;(defun pg-mouse-drag-move-region-function (event click-count dragp)
; (save-excursion
; (let* ((span (span-at (mouse-set-point event) 'type)))
; (if span
; (if pg-drag-region-point
; ;; Move the region at point to region here.
;(defun pg-mouse-drag-up-move-region-function (event click-count)
; (setq pg-drag-region-point nil))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; FIXME: not working right yet, sigh...
(defun proof-forward-command (&optional num)
"Move forward to the start of the next proof region."
(interactive "p")
(skip-chars-forward " \t\n")
(let* ((span (or (span-at (point) 'type)
(and (skip-chars-backward " \t\n")
(> (point) (point-min))
(span-at (1- (point)) 'type))))
(nextspan (and span (pg-numth-span-higher-or-lower
(pg-control-span-of span) num 'noerr))))
(cond
((and nextspan (> num 0))
(goto-char (span-start nextspan))
(skip-chars-forward " \t\n"))
((and nextspan (< num 0))
(goto-char (span-end nextspan)))
((and span (> num 0))
(goto-char (span-end span)))
((and span (< num 0))
(goto-char (span-start span))))))
(defun proof-backward-command (&optional num)
(interactive "p")
(proof-forward-command (- num)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Span menus and keymaps (maybe belongs in pg-menu)
;;
;; FIXME: TODO here:
;;
;; Check for a 'type which is one of the elements we know about
;; (pgidioms).
;;
(defun pg-pos-for-event (event)
"Return position corresponding to position of a mouse click EVENT."
(with-current-buffer
(window-buffer (posn-window (event-start event)))
(posn-point (event-start event))))
(defun pg-span-for-event (event)
"Return span corresponding to position of a mouse click EVENT."
(span-at (pg-pos-for-event event) 'type))
(defun pg-span-context-menu (event)
(interactive "e")
(let ((span (pg-span-for-event event))
cspan)
;; Find controlling span
(while (setq cspan (span-property span 'controlspan))
(setq span cspan))
(let*
((idiom (and span (span-property span 'idiom)))
(id (and span (span-property span 'id))))
(popup-menu (pg-create-in-span-context-menu
span
(if idiom (symbol-name idiom))
(if id (symbol-name id)))))))
(defun pg-toggle-visibility ()
"Toggle visibility of region under point."
(interactive)
(let* ((span (span-at (point) 'type))
(idiom (and span (span-property span 'idiom)))
(id (and span (span-property span 'id))))
(and idiom id
(pg-toggle-element-visibility (symbol-name idiom) (symbol-name id)))))
(defun pg-create-in-span-context-menu (span idiom name)
"Create the dynamic context-sensitive menu for a span."
;; FIXME: performance here, consider caching in the span itself?
;; (or maybe larger menu spans which are associated with a menu).
;; FIXME: treat proof and non-proof regions alike, could add
;; visibility controls for non-proof regions also, redesigning
;; idiom notion.
(append
(list (pg-span-name span))
(list (vector
"Show/hide"
(if idiom (list `pg-toggle-element-visibility idiom name)
idiom)
(not (not idiom))))
(list (vector
"Copy" (list 'pg-copy-span-contents span) t))
(list (vector
"Undo"
(list 'pg-span-undo span) t))
(list (vector
"Move up" (list 'pg-move-span-contents span -1)
(pg-numth-span-higher-or-lower (pg-control-span-of span) -1 'noerr)))
(list (vector
"Move down" (list 'pg-move-span-contents span 1)
(pg-numth-span-higher-or-lower (pg-control-span-of span) 1 'noerr)))
(if proof-script-span-context-menu-extensions
(funcall proof-script-span-context-menu-extensions span idiom name))
(if proof-shell-theorem-dependency-list-regexp
(proof-dependency-in-span-context-menu span))))
(defun pg-span-undo (span)
"Undo to the start of the given SPAN."
(interactive)
(goto-char (span-start span))
(proof-retract-until-point))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Generic adjustmenth of prover's pretty-printing width
;; (adapted from Lego's mode, was also used in Isar and Plastic)
;;
;; FIXME: complete this.
;(defvar pg-prover-current-line-width nil
; "Cache value for pg-adjust-line-width to avoid repeatedly changing width.")
;(defun pg-adjust-line-width (buffer)
; "Adjust the prover's line width to match that of BUFFER."
; (proof-if-setting-configured proof-shell-adjust-line-width-cmd)
; proof-shell-(let* ((win (get-buffer-window buffer))
; (curwid (if win (window-width win))))
; (if (and curwid
; (not (equal curwid pg-prover-current-line-width)))
; (progn
; ;; Update the prover's output width
; (proof-shell-invisible-command
;with-current-buffer buffer
; (let ((current-width
; (window-width (get-buffer-window proof-goals-buffer)))
; (if (equal current-width lego-shell-current-line-width) ()
; ; else
; (setq lego-shell-current-line-width current-width)
; (set-buffer proof-shell-buffer)
; (insert (format lego-pretty-set-width (- current-width 1)))
; )))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Message buffer hints (added in PG 3.5)
;;
(defun pg-goals-buffers-hint ()
(pg-hint "Use \\[proof-display-some-buffers] to rotate output buffers; \\[pg-response-clear-displays] to clear response & trace."))
;;;###autoload
(defun pg-slow-fontify-tracing-hint ()
(pg-hint "Large tracing output; decorating intermittently. Use \\[pg-response-clear-displays] to clear trace."))
;;;###autoload
(defun pg-response-buffers-hint (&optional nextbuf)
(pg-hint
(format
"\\[proof-prf] for goals;%s \\[proof-layout-windows] refreshes"
(if (not proof-multiple-frames-enable) ;; and not proof-three-window-enable
(format " \\[proof-display-some-buffers] rotates output%s;"
(if nextbuf (concat " (next:" nextbuf ")") ""))
""))))
;;;###autoload
(defun pg-jump-to-end-hint ()
(pg-hint "Use \\[proof-goto-end-of-locked] to jump to end of processed region"))
;;;###autoload
(defun pg-processing-complete-hint ()
"Display hint for showing end of locked region or processing complete."
(if (buffer-live-p proof-script-buffer)
(let ((win (get-buffer-window proof-script-buffer)))
(unless ;; end of locked already displayed
(and win (pos-visible-in-window-p (proof-unprocessed-begin)))
(save-excursion
(set-buffer proof-script-buffer)
(cond
((proof-locked-region-empty-p)) ;; nothing if empty
((proof-locked-region-full-p)
(pg-hint
(concat "Processing complete in " (buffer-name proof-script-buffer))))
(t ;; partly complete: hint about displaying the locked end
(pg-jump-to-end-hint))))))))
;;;###autoload
(defun pg-next-error-hint ()
"Display hint for locating error."
(pg-hint "Use \\[proof-next-error] to go to next error location."))
;;;###autoload
(defun pg-hint (hintmsg)
"Display a hint HINTMSG in the minibuffer, if `pg-show-hints' is non-nil.
The function `substitute-command-keys' is called on the argument."
(if pg-show-hints (message (substitute-command-keys hintmsg))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Symbol near point/identifier under mouse query
;;
;; Note: making these bindings globally is perhaps a bit obnoxious, but
;; this modifier combination is currently unused.
(global-set-key [C-M-mouse-1] 'pg-identifier-under-mouse-query)
(global-set-key [f5] 'pg-identifier-near-point-query)
(defun pg-identifier-under-mouse-query (event)
(interactive "e")
(if proof-query-identifier-command
(save-selected-window
(save-selected-frame
(save-excursion
(mouse-set-point event)
(pg-identifier-near-point-query))))))
(defun pg-identifier-near-point-query ()
(interactive)
(let* ((stend (if (region-active-p)
(cons (region-beginning) (region-end))
(pg-current-word-pos)))
(start (car-safe stend))
(end (cdr-safe stend))
(identifier (if start
(buffer-substring-no-properties
start end)))
(ctxt (if start
(save-excursion
(goto-char start)
(proof-buffer-syntactic-context)))))
(if start
(pg-identifier-query
identifier ctxt
;; the callback
(lexical-let ((s start) (e end))
(lambda (x)
(let ((idspan (span-make s e)))
;; TODO: clean these up!
(span-set-property idspan 'help-echo
(pg-last-output-displayform)))))))))
(defvar proof-query-identifier-collection nil)
(defvar proof-query-identifier-history nil)
(defun proof-query-identifier (string)
(interactive
(list
(completing-read "Query identifier: "
proof-query-identifier-collection
nil nil
(current-word)
proof-query-identifier-history)))
(if string (pg-identifier-query string)))
(defun pg-identifier-query (identifier &optional ctxt callback)
"Query the proof assisstant about the given identifier (or string).
This uses `proof-query-identifier-command'.
If CALLBACK is set, we invoke that when the command completes."
(unless (or (null identifier)
(string-equal identifier "")) ;; or whitespace?
(proof-shell-invisible-command
(cond
((stringp proof-query-identifier-command)
;; simple customization
(format proof-query-identifier-command identifier))
(t
;; buffer-syntactic context dependent, as an alist
;; (handy for Isabelle: not a true replacement for parsing)
(format (nth 1 (assq ctxt proof-query-identifier-command))
identifier)))
nil ; no wait
callback)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Imenu and Speedbar (added in PG 3.5)
;;
(eval-after-load "speedbar"
'(and proof-assistant-symbol ;; *should* be set by now
(speedbar-add-supported-extension
(nth 2 (assoc proof-assistant-symbol proof-assistant-table)))))
;;;###autoload
(defun proof-imenu-enable ()
"Add or remove index menu."
(if proof-imenu-enable
(imenu-add-to-menubar "Index")
(progn
(let ((oldkeymap (keymap-parent (current-local-map))))
(if ;; sanity checks in case someone else set local keymap
(and oldkeymap
(lookup-key (current-local-map) [menu-bar index])
(not
(lookup-key oldkeymap [menu-bar index])))
(use-local-map oldkeymap)))
(remove-hook 'menu-bar-update-hook 'imenu-update-menubar))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Command history (added in PG 3.7)
;;
;; This implements a history ring for commands in the locked region.
;; Inspired by (and code heavily copied from) comint.
;;
;; The current behaviour is not ideal: we only extend the input ring as
;; we process (so history does not browse pink text while the
;; prover is busy). Moreover, instead of using a history, we might
;; simply parse commands backwards (or forwards) in the buffer.
;; (i.e, more like the copying behaviour implemented in Bibtex mode).
;;
(defvar pg-input-ring nil
"Ring of previous inputs.")
(defvar pg-input-ring-index nil
"Position of last matched command.")
(defvar pg-stored-incomplete-input nil
"Stored incomplete input: string between point and locked.")
(defun pg-previous-input (arg)
"Cycle backwards through input history, saving input."
(interactive "*p")
(if (and pg-input-ring-index
(or ;; leaving the "end" of the ring
(and (< arg 0) ; going down
(eq pg-input-ring-index 0))
(and (> arg 0) ; going up
(eq pg-input-ring-index
(1- (ring-length pg-input-ring)))))
pg-stored-incomplete-input)
(pg-restore-input)
(pg-previous-matching-input "." arg)))
(defun pg-next-input (arg)
"Cycle forwards through input history."
(interactive "*p")
(pg-previous-input (- arg)))
(defun pg-delete-input ()
(let* ((unproc (proof-unprocessed-begin))
(start (save-excursion
(goto-char unproc)
(skip-chars-forward " \t\n")
(point)))
(end (point-at-eol)))
(cond
((< start end)
(delete-region start end))
((< start (point-at-eol))
(delete-region start (point-at-eol))))))
(defun pg-get-old-input ()
"Return text between end of locked region and point, up to EOL.
If there is no text, return the empty string."
(let* ((unproc (proof-unprocessed-begin))
(start (save-excursion
(goto-char unproc)
(skip-chars-forward " \t\n")
(point)))
(end (point-at-eol)))
(if (< start end)
(buffer-substring-no-properties start end)
nil)))
(defun pg-restore-input ()
"Restore unfinished input."
(interactive)
(when pg-input-ring-index
(pg-delete-input)
(when (> (length pg-stored-incomplete-input) 0)
(insert pg-stored-incomplete-input)
(message "Input restored"))
(setq pg-input-ring-index nil)))
(defun pg-search-start (arg)
"Index to start a directional search, starting at `pg-input-ring-index'."
(if pg-input-ring-index
;; If a search is running, offset by 1 in direction of arg
(mod (+ pg-input-ring-index (if (> arg 0) 1 -1))
(ring-length pg-input-ring))
;; For a new search, start from beginning or end, as appropriate
(if (>= arg 0)
0 ; First elt for forward search
(1- (ring-length pg-input-ring))))) ; Last elt for backward search
(defun pg-regexp-arg (prompt)
"Return list of regexp and prefix arg using PROMPT."
(let* (;; Don't clobber this.
(last-command last-command)
(regexp (read-from-minibuffer prompt nil nil nil
'minibuffer-history-search-history)))
(list (if (string-equal regexp "")
(setcar minibuffer-history-search-history
(nth 1 minibuffer-history-search-history))
regexp)
(prefix-numeric-value current-prefix-arg))))
(defun pg-search-arg (arg)
;; First make sure there is a ring and that we are after the process mark
(cond ((not (>= (point) (proof-unprocessed-begin)))
(error "Not in unlocked region"))
((or (null pg-input-ring)
(ring-empty-p pg-input-ring))
(error "Empty input ring"))
((zerop arg)
;; arg of zero resets search from beginning, and uses arg of 1
(setq pg-input-ring-index nil)
1)
(t
arg)))
(defun pg-previous-matching-input-string-position (regexp arg &optional start)
"Return the index matching REGEXP ARG places along the input ring.
Moves relative to START, or `pg-input-ring-index'."
(if (or (not (ring-p pg-input-ring))
(ring-empty-p pg-input-ring))
(error "No history"))
(let* ((len (ring-length pg-input-ring))
(motion (if (> arg 0) 1 -1))
(n (mod (- (or start (pg-search-start arg)) motion) len))
(tried-each-ring-item nil)
(prev nil))
;; Do the whole search as many times as the argument says.
(while (and (/= arg 0) (not tried-each-ring-item))
;; Step once.
(setq prev n
n (mod (+ n motion) len))
;; If we haven't reached a match, step some more.
(while (and (< n len) (not tried-each-ring-item)
(not (string-match regexp (ring-ref pg-input-ring n))))
(setq n (mod (+ n motion) len)
;; If we have gone all the way around in this search.
tried-each-ring-item (= n prev)))
(setq arg (if (> arg 0) (1- arg) (1+ arg))))
;; Now that we know which ring element to use, if we found it, return that.
(if (string-match regexp (ring-ref pg-input-ring n))
n)))
(defun pg-previous-matching-input (regexp n)
"Search backwards through input history for match for REGEXP.
\(Previous history elements are earlier commands.)
With prefix argument N, search for Nth previous match.
If N is negative, find the next or Nth next match."
(interactive (pg-regexp-arg "Previous input matching (regexp): "))
(setq n (pg-search-arg n))
(let ((pos (pg-previous-matching-input-string-position regexp n)))
;; Has a match been found?
(if (null pos)
(error "Match not found for regexp %s" regexp)
;; If leaving the edit line, save partial input
(if (null pg-input-ring-index) ;not yet on ring
(setq pg-stored-incomplete-input (pg-get-old-input)))
(setq pg-input-ring-index pos)
(message "History item: %d" (1+ pos))
(pg-delete-input)
(insert (ring-ref pg-input-ring pos)))))
(defun pg-next-matching-input (regexp n)
"Search forwards through input history for match for REGEXP.
\(Later history elements are more recent commands.)
With prefix argument N, search for Nth following match.
If N is negative, find the previous or Nth previous match."
(interactive (pg-regexp-arg "Next input matching (regexp): "))
(pg-previous-matching-input regexp (- n)))
(defvar pg-matching-input-from-input-string ""
"Input previously used to match input history.")
;;;###autoload
(defun pg-previous-matching-input-from-input (n)
"Search backwards through input history for match for current input.
\(Previous history elements are earlier commands.)
With prefix argument N, search for Nth previous match.
If N is negative, search forwards for the -Nth following match."
(interactive "p")
(if (not (memq last-command '(pg-previous-matching-input-from-input
pg-next-matching-input-from-input)))
;; Starting a new search
(setq pg-matching-input-from-input-string (pg-get-old-input)
pg-input-ring-index nil))
(if pg-matching-input-from-input-string
(pg-previous-matching-input
(concat "^" (regexp-quote pg-matching-input-from-input-string))
n)
(pg-previous-matching-input "." n)))
;;;###autoload
(defun pg-next-matching-input-from-input (n)
"Search forwards through input history for match for current input.
\(Following history elements are more recent commands.)
With prefix argument N, search for Nth following match.
If N is negative, search backwards for the -Nth previous match."
(interactive "p")
(pg-previous-matching-input-from-input (- n)))
;;;###autoload
(defun pg-add-to-input-history (cmd)
"Maybe add CMD to the input history.
CMD is only added to the input history if it is not a duplicate
of the last item added."
(when (or (not (ring-p pg-input-ring))
(ring-empty-p pg-input-ring)
(not (string-equal (ring-ref pg-input-ring 0) cmd)))
(unless (ring-p pg-input-ring)
(setq pg-input-ring (make-ring pg-input-ring-size)))
(ring-insert pg-input-ring cmd)))
;;;###autoload
(defun pg-remove-from-input-history (cmd)
"Maybe remove CMD from the end of the input history.
This is called when the command is undone. It's only
removed if it matches the last item in the ring."
(if (and (ring-p pg-input-ring)
(not (ring-empty-p pg-input-ring))
(string-equal (ring-ref pg-input-ring 0) cmd))
(ring-remove pg-input-ring 0)))
;;;###autoload
(defun pg-clear-input-ring ()
(setq pg-input-ring nil))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Protected undo (added in PG 4.0)
;;
;; From a suggestion of Stefan Monnier as an improvement over the
;; previous use of `undo-make-selective-list' to hack
;; `buffer-undo-list' in `proof-set-queue-endpoints'.
;;
(define-key proof-mode-map [remap undo] 'pg-protected-undo)
(define-key proof-mode-map [remap advertised-undo] 'pg-protected-undo)
(defun pg-protected-undo (&optional arg)
"Behaves as `undo' unless undo would edit the locked region.
In this case, undo is only allowed in the unlocked region,
unless `proof-allow-undo-in-read-only' is set.
Undoing will use the standard undo in region behaviour, which
skips undo entries in the locked region."
(interactive "*P")
(if (or (not proof-locked-span)
proof-allow-undo-in-read-only
(equal (proof-queue-or-locked-end) (point-min)))
(undo arg)
(let* (;(transient-mark-mode nil)
(savedpoint (point))
;(savedmark (mark))
(repeat (if (numberp arg) arg 1)))
(push-mark (proof-queue-or-locked-end) t)
(save-excursion
(goto-char (point-max))
(while (> repeat 0) ; crude recovery of n-fold undo
(undo t) ; undo in unlocked region only
(decf repeat)))
(pop-mark))))
(provide 'pg-user)
;;; pg-user.el ends here
|