[Emacs-diffs] Changes to emacs/lisp/ediff-util.el

[Romain Francoise]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.61 emacs/lisp/ediff-util.el:1.62
*** emacs/lisp/ediff-util.el:1.61       Tue Sep 20 17:47:28 2005
--- emacs/lisp/ediff-util.el    Sat Sep 24 13:44:02 2005
***************
*** 2219,2236 ****
            regexp-A
            (read-string
             (format
!             "Ignore A-regions matching this regexp (default \"%s\"): "
              ediff-regexp-hide-A))
            regexp-B
            (read-string
             (format
!             "Ignore B-regions matching this regexp (default \"%s\"): "
              ediff-regexp-hide-B)))
        (if ediff-3way-comparison-job
          (setq regexp-C
                (read-string
                 (format
!                 "Ignore C-regions matching this regexp (default \"%s\"): "
                  ediff-regexp-hide-C))))
        (if (eq ediff-hide-regexp-connective 'and)
          (setq msg-connective "BOTH"
--- 2219,2236 ----
            regexp-A
            (read-string
             (format
!             "Ignore A-regions matching this regexp (default %s): "
              ediff-regexp-hide-A))
            regexp-B
            (read-string
             (format
!             "Ignore B-regions matching this regexp (default %s): "
              ediff-regexp-hide-B)))
        (if ediff-3way-comparison-job
          (setq regexp-C
                (read-string
                 (format
!                 "Ignore C-regions matching this regexp (default %s): "
                  ediff-regexp-hide-C))))
        (if (eq ediff-hide-regexp-connective 'and)
          (setq msg-connective "BOTH"
***************
*** 2258,2275 ****
            regexp-A
            (read-string
             (format
!             "Focus on A-regions matching this regexp (default \"%s\"): "
              ediff-regexp-focus-A))
            regexp-B
            (read-string
             (format
!             "Focus on B-regions matching this regexp (default \"%s\"): "
              ediff-regexp-focus-B)))
        (if ediff-3way-comparison-job
          (setq regexp-C
                (read-string
                 (format
!                 "Focus on C-regions matching this regexp (default \"%s\"): "
                  ediff-regexp-focus-C))))
        (if (eq ediff-focus-regexp-connective 'and)
          (setq msg-connective "BOTH"
--- 2258,2275 ----
            regexp-A
            (read-string
             (format
!             "Focus on A-regions matching this regexp (default %s): "
              ediff-regexp-focus-A))
            regexp-B
            (read-string
             (format
!             "Focus on B-regions matching this regexp (default %s): "
              ediff-regexp-focus-B)))
        (if ediff-3way-comparison-job
          (setq regexp-C
                (read-string
                 (format
!                 "Focus on C-regions matching this regexp (default %s): "
                  ediff-regexp-focus-C))))
        (if (eq ediff-focus-regexp-connective 'and)
          (setq msg-connective "BOTH"