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

[D . Goel]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.59 emacs/lisp/ediff-util.el:1.60
*** emacs/lisp/ediff-util.el:1.59       Sat Aug  6 22:13:42 2005
--- emacs/lisp/ediff-util.el    Sun Sep 18 12:25:01 2005
***************
*** 2075,2081 ****
          (ediff-clear-fine-differences n))
        ;; Make sure that the message about saving and how to restore is seen
        ;; by the user
!       (message messg))
      ))
  
  ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
--- 2075,2081 ----
          (ediff-clear-fine-differences n))
        ;; Make sure that the message about saving and how to restore is seen
        ;; by the user
!       (message "%s" messg))
      ))
  
  ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
***************
*** 2720,2726 ****
             (format "Another buffer is visiting file %s. Too dangerous to save 
the merge buffer"
                     file)))
        (beep)
!       (message warn-message)
        (with-output-to-temp-buffer ediff-msg-buffer
          (princ "\n\n")
          (princ warn-message)
--- 2720,2726 ----
             (format "Another buffer is visiting file %s. Too dangerous to save 
the merge buffer"
                     file)))
        (beep)
!       (message "%s" warn-message)
        (with-output-to-temp-buffer ediff-msg-buffer
          (princ "\n\n")
          (princ warn-message)
***************
*** 3286,3292 ****
            (princ warn-message)
            (princ "\n\n"))
          (if (y-or-n-p
!              (message warn-message))
              (with-current-buffer buff
                (save-buffer)
                (kill-buffer (current-buffer)))
--- 3286,3292 ----
            (princ warn-message)
            (princ "\n\n"))
          (if (y-or-n-p
!              (message "%s" warn-message))
              (with-current-buffer buff
                (save-buffer)
                (kill-buffer (current-buffer)))