History never sets prompt default except when explicitly instructed.

diff --git a/v7/src/edwin/compile.scm b/v7/src/edwin/compile.scm
index 61b7113c5d61e9c554ece1a3b44a916a80826c2b..34c525d941847b76e11e3dcf85949cbb51fc0c8b 100644 (file)
--- a/v7/src/edwin/compile.scm
+++ b/v7/src/edwin/compile.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: compile.scm,v 1.7 1999/01/28 06:03:23 cph Exp $
+;;; $Id: compile.scm,v 1.8 1999/01/28 06:10:20 cph Exp $
 ;;;
 ;;; Copyright (c) 1992-1999 Massachusetts Institute of Technology
 ;;;
@@ -35,7 +35,8 @@ with output going to the buffer *compilation*."
     (list (prompt-for-string "Compile command"
                             (ref-variable compile-command)
                             'DEFAULT-TYPE 'INSERTED-DEFAULT
-                            'HISTORY 'COMPILE)))
+                            'HISTORY 'COMPILE
+                            'HISTORY-DEFAULT #t)))
   (lambda (command)
     (set-variable! compile-command command)
     (run-compilation command)))
@@ -45,7 +46,8 @@ with output going to the buffer *compilation*."
   (lambda ()
     (list (prompt-for-string "Run grep (with args): " #f
                             'DEFAULT-TYPE 'INSERTED-DEFAULT
-                            'HISTORY 'GREP)))
+                            'HISTORY 'GREP
+                            'HISTORY-DEFAULT #t)))
   (lambda (command)
     (run-compilation (string-append "grep -n " command " /dev/null"))))
 
@@ -54,7 +56,8 @@ with output going to the buffer *compilation*."
   (lambda ()
     (list (prompt-for-string "Run fgrep (with args): " #f
                             'DEFAULT-TYPE 'INSERTED-DEFAULT
-                            'HISTORY 'FGREP)))
+                            'HISTORY 'FGREP
+                            'HISTORY-DEFAULT #t)))
   (lambda (command)
     (run-compilation (string-append "grep -n " command " /dev/null"))))
 

diff --git a/v7/src/edwin/prompt.scm b/v7/src/edwin/prompt.scm
index 5fd687046b4c00d341ea2808f5ec259e91af74fa..a56998964fb224348922d403bdc6dffba0a79cbb 100644 (file)
--- a/v7/src/edwin/prompt.scm
+++ b/v7/src/edwin/prompt.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: prompt.scm,v 1.177 1999/01/28 05:59:00 cph Exp $
+;;; $Id: prompt.scm,v 1.178 1999/01/28 06:10:14 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-1999 Massachusetts Institute of Technology
 ;;;
@@ -429,14 +429,12 @@
                                 'SET-PROMPT-HISTORY-STRINGS!))
   (set-cdr! (name->history name) strings))
 
-(define-prompt-option 'HISTORY symbol?
-  (lambda (options history)
-    (set-options/history! options history)
-    (history->default-string options)))
+(define-simple-option 'HISTORY symbol?)
+(define-simple-option 'HISTORY-INDEX exact-nonnegative-integer?)
 
-(define-prompt-option 'HISTORY-INDEX exact-nonnegative-integer?
-  (lambda (options index)
-    (set-options/history-index! options index)
+(define-prompt-option 'HISTORY-DEFAULT (lambda (x) x #t)
+  (lambda (options ignore)
+    ignore
     (history->default-string options)))
 
 (define (history->default-string options)
@@ -933,7 +931,8 @@ Whilst editing the command, the following commands are available:
       (prompt-for-string "Redo" #f
                         'DEFAULT-TYPE 'INSERTED-DEFAULT
                         'HISTORY 'REPEAT-COMPLEX-COMMAND
-                        'HISTORY-INDEX (- argument 1))))))
+                        'HISTORY-INDEX (- argument 1)
+                        'HISTORY-DEFAULT #t)))))
 \f
 ;;; Password Prompts