[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el

[Romain Francoise]

Index: emacs/lisp/mail/rmail.el
diff -c emacs/lisp/mail/rmail.el:1.414 emacs/lisp/mail/rmail.el:1.415
*** emacs/lisp/mail/rmail.el:1.414      Mon Aug 29 14:38:57 2005
--- emacs/lisp/mail/rmail.el    Sat Sep 24 13:43:59 2005
***************
*** 3038,3050 ****
    (interactive
      (let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
           (prompt
!           (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
           regexp)
!       (if rmail-search-last-regexp
!         (setq prompt (concat prompt
!                              "(default "
!                              rmail-search-last-regexp
!                              ") ")))
        (setq regexp (read-string prompt))
        (cond ((not (equal regexp ""))
             (setq rmail-search-last-regexp regexp))
--- 3038,3051 ----
    (interactive
      (let* ((reversep (< (prefix-numeric-value current-prefix-arg) 0))
           (prompt
!           (concat (if reversep "Reverse " "") "Rmail search (regexp"))
           regexp)
!       (setq prompt
!           (concat prompt
!                   (if rmail-search-last-regexp
!                       (concat ", default "
!                               rmail-search-last-regexp "): ")
!                     "): ")))
        (setq regexp (read-string prompt))
        (cond ((not (equal regexp ""))
             (setq rmail-search-last-regexp regexp))
***************
*** 3109,3121 ****
    (interactive
      (let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
           (prompt
!           (concat (if reversep "Reverse " "") "Rmail search (regexp): "))
           regexp)
!       (if rmail-search-last-regexp
!         (setq prompt (concat prompt
!                              "(default "
!                              rmail-search-last-regexp
!                              ") ")))
        (setq regexp (read-string prompt))
        (cond ((not (equal regexp ""))
             (setq rmail-search-last-regexp regexp))
--- 3110,3123 ----
    (interactive
      (let* ((reversep (>= (prefix-numeric-value current-prefix-arg) 0))
           (prompt
!           (concat (if reversep "Reverse " "") "Rmail search (regexp"))
           regexp)
!       (setq prompt
!           (concat prompt
!                   (if rmail-search-last-regexp
!                       (concat ", default "
!                               rmail-search-last-regexp "): ")
!                     "): ")))
        (setq regexp (read-string prompt))
        (cond ((not (equal regexp ""))
             (setq rmail-search-last-regexp regexp))