Adjust write-region so file name is at the beginning again

* lisp/epa-file.el (epa-file-write-region):
* lisp/gnus/mm-util.el (mm-append-to-file):
* lisp/jka-compr.el (jka-compr-write-region):
* lisp/net/ange-ftp.el (ange-ftp-write-region):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-write-region):
* lisp/net/tramp-sh.el (tramp-sh-handle-write-region):
* src/fileio.c (write_region): Put file name at the beginning and move
number of characters to the end of the message.

diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 2e06c8374ffd06d0b3747ac5c8134c505bb3390d..64e00e0aba46f42198e855acc349754e4c69480f 100644 (file)
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -290,11 +290,10 @@ If no one is selected, symmetric encryption will be performed.  "
     (if (or (eq visit t)
            (eq visit nil)
            (stringp visit))
-       (message "Wrote %d characters to `%s'"
+       (message "Wrote `%s' (%d characters)" buffer-file-name
                  (cond ((null start) (buffer-size))
                        ((stringp start) (length start))
-                       (t (- end start)))
-                 buffer-file-name))))
+                       (t (- end start)))))))
 (put 'write-region 'epa-file 'epa-file-write-region)
 
 (defun epa-file-select-keys ()

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index f0dc803eddce7844898ecf66d40846075538fe4c..f4e79e537311bc5a64c05c6df992814435850209 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -736,7 +736,7 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'."
                     inhibit-file-name-handlers)
           inhibit-file-name-handlers)))
     (write-region start end filename t 'no-message)
-    (message "Appended %d characters to `%s'" (- end start) filename)))
+    (message "Appended to `%s' (%d characters)" filename (- end start))))
 
 (defun mm-write-region (start end filename &optional append visit lockname
                              coding-system inhibit)

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index a5e24a6f9ac1943a46d1d67472abfb8ef80fa7c8..e4f7348c81a77325feb5f4046f91f5ccb6becae4 100644 (file)
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -357,11 +357,10 @@ There should be no more than seven characters after the final `/'."
          (and (or (eq visit t)
                   (eq visit nil)
                   (stringp visit))
-              (message "Wrote %d characters to `%s'"
+              (message "Wrote `%s' (%d characters)" visit-file
                         (cond ((null start) (buffer-size))
                               ((stringp start) (length start))
-                              (t (- end start)))
-                        visit-file))
+                              (t (- end start)))))
 
          ;; ensure `last-coding-system-used' has an appropriate value
          (setq last-coding-system-used coding-system-used)

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 6e84269e30872145ea923a80045ad0127c90f32a..cd0ae8d420380aa42465b8dab6c54776ff8b02d8 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3284,11 +3284,10 @@ system TYPE.")
                (set-buffer-modified-p nil)))
          ;; ensure `last-coding-system-used' has an appropriate value
          (setq last-coding-system-used coding-system-used)
-         (ange-ftp-message "Wrote %d characters to `%s'"
+         (ange-ftp-message "Wrote `%s' (%d characters)" abbr
                             (cond ((null start) (buffer-size))
                                   ((stringp start) (length start))
-                                  (t (- end start)))
-                            abbr)
+                                  (t (- end start))))
          (ange-ftp-add-file-entry filename))
       (ange-ftp-real-write-region start end filename append visit))))
 

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index b7477271d7033a450e11901326fd399391e134d3..593be33e833e9db95db7e39ec87f1013d3e5d832 100644 (file)
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1223,11 +1223,10 @@ file-notify events."
 
     ;; The end.
     (when (or (eq visit t) (null visit) (stringp visit))
-      (tramp-message v 0 "Wrote %d characters to `%s'"
+      (tramp-message v 0 "Wrote `%s' (%d characters)" filename
                      (cond ((null start) (buffer-size))
                            ((stringp start) (length start))
-                           (t (- end start)))
-                     filename))
+                           (t (- end start)))))
     (run-hooks 'tramp-handle-write-region-hook)))
 
 \f

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index a8556b9a0d030c77b33f35b483563891959a9e6a..475f2b9a5d147061bdf06cd4ba75096552b513d7 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3411,11 +3411,10 @@ the result will be a local, non-Tramp, file name."
         (when need-chown
           (tramp-set-file-uid-gid filename uid gid))
        (when (or (eq visit t) (null visit) (stringp visit))
-          (tramp-message v 0 "Wrote %d characters to `%s'"
+          (tramp-message v 0 "Wrote `%s' (%d characters)" filename
                          (cond ((null start) (buffer-size))
                                ((stringp start) (length start))
-                               (t (- end start)))
-                         filename))
+                               (t (- end start)))))
        (run-hooks 'tramp-handle-write-region-hook)))))
 
 (defvar tramp-vc-registered-file-names nil

diff --git a/src/fileio.c b/src/fileio.c
index 567f56c90630c72d2356196373a1984c15cc733c..fc853f2667359bcf9d120c92f02850e169cd0093 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5152,14 +5152,13 @@ write_region (Lisp_Object start, Lisp_Object end, Lisp_Object filename,
   if (!auto_saving && !noninteractive)
     {
       AUTO_STRING (format, NUMBERP (append)
-                   ? "Updated %d characters of `%s'"
+                   ? "Updated `%s' (%d characters)"
                    : ! NILP (append)
-                   ? "Added %d characters to `%s'"
-                   : "Wrote %d characters to `%s'");
-      CALLN (Fmessage, format,
+                   ? "Added to `%s' (%d characters)"
+                   : "Wrote `%s' (%d characters)");
+      CALLN (Fmessage, format, visit_file,
              (STRINGP (start) ? Flength (start)
-              : make_number (XINT (end) - XINT (start))),
-             visit_file);
+              : make_number (XINT (end) - XINT (start))));
     }
   return Qnil;
 }