Re: Minibuffer default values list

[Juri Linkov <juri@jurta.org>]

I remember there were discussions what the default value is better to
use in `occur'.  Now there is no need to select only one default value.
The patch below adds a list of default values to `keep-lines',
`flush-lines', `how-many' and `occur':

Index: lisp/replace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/replace.el,v
retrieving revision 1.260
diff -c -r1.260 replace.el
*** lisp/replace.el	10 Nov 2007 21:48:46 -0000	1.260
--- lisp/replace.el	11 Nov 2007 23:45:09 -0000
***************
*** 533,540 ****
    "Read arguments for `keep-lines' and friends.
  Prompt for a regexp with PROMPT.
  Value is a list, (REGEXP)."
!   (list (read-from-minibuffer prompt nil nil nil
! 			      'regexp-history nil t)
  	nil nil t))
  
  (defun keep-lines (regexp &optional rstart rend interactive)
--- 533,550 ----
    "Read arguments for `keep-lines' and friends.
  Prompt for a regexp with PROMPT.
  Value is a list, (REGEXP)."
!   (list (read-from-minibuffer
! 	 prompt nil nil nil 'regexp-history
! 	 (delq nil (list
! 		    (regexp-quote
! 		     (funcall (or find-tag-default-function
! 				  (get major-mode 'find-tag-default-function)
! 				  'find-tag-default)))
! 		    (car regexp-search-ring)
! 		    (regexp-quote (car search-ring))
! 		    (car (symbol-value
! 			  query-replace-from-history-variable))))
! 	 t)
  	nil nil t))
  
  (defun keep-lines (regexp &optional rstart rend interactive)
***************
*** 938,958 ****
        (nreverse result))))
  
  (defun occur-read-primary-args ()
!   (list (let* ((default (car regexp-history))
  	       (input
  		(read-from-minibuffer
! 		 (if default
! 		     (format "List lines matching regexp (default %s): "
! 			     (query-replace-descr default))
! 		   "List lines matching regexp: ")
! 		 nil
! 		 nil
! 		 nil
! 		 'regexp-history
! 		 default)))
! 	  (if (equal input "")
! 	      default
! 	    input))
  	(when current-prefix-arg
  	  (prefix-numeric-value current-prefix-arg))))
  
--- 948,972 ----
        (nreverse result))))
  
  (defun occur-read-primary-args ()
!   (list (let* ((default
! 		 (delq nil (list
! 			    (and transient-mark-mode mark-active
! 				 (regexp-quote
! 				  (buffer-substring-no-properties
! 				   (region-beginning) (region-end))))
! 			    (regexp-quote
! 			     (funcall (or find-tag-default-function
! 					  (get major-mode 'find-tag-default-function)
! 					  'find-tag-default)))
! 			    (car regexp-search-ring)
! 			    (regexp-quote (car search-ring))
! 			    (car (symbol-value
! 				  query-replace-from-history-variable)))))
  	       (input
  		(read-from-minibuffer
! 		 "List lines matching regexp: "
! 		 nil nil nil 'regexp-history default)))
! 	  input)
  	(when current-prefix-arg
  	  (prefix-numeric-value current-prefix-arg))))
  

-- 
Juri Linkov
http://www.jurta.org/emacs/