Revert "Output number of characters added to file (Bug#354)"

The extra message text turned out to be quite annoying in practice,
and is generally more trouble than it's worth.  Also revert several
related changes.

Partially revert "Handle `write-region' messages in Tramp properly"
Revert "New var write-region-verbose, default nil"
Revert "* src/fileio.c (write_region): Don't say "1 characters".  (Bug#26796)"
Revert "Minor tuneup of write-region change"
Revert "Adjust write-region so file name is at the beginning again"
Revert "Fix handling of non-integer START param to write-region"
Revert "Output number of characters added to file (Bug#354)"

* doc/emacs/files.texi (Misc File Ops):
* etc/NEWS:
* 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-adb.el (tramp-adb-handle-write-region):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-write-region):
* lisp/net/tramp-sh.el (tramp-sh-handle-write-region):
* lisp/net/tramp-smb.el (tramp-smb-handle-write-region):
* lisp/net/tramp.el (tramp-handle-write-region-message):
* src/fileio.c (write_region, syms_of_fileio):
* test/lisp/net/tramp-tests.el (tramp-test10-write-region): Remove
extra characters from file writing messages.

1 files changed, 7 insertions, 28 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 6138bfc68bb..acbf76e0d81 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5150,29 +5150,13 @@ write_region (Lisp_Object start, Lisp_Object end, Lisp_Object filename,
     }
 
   if (!auto_saving && !noninteractive)
-    {
-      EMACS_INT nchars = (STRINGP (start) ? SCHARS (start)
-                          : XINT (end) - XINT (start));
-      AUTO_STRING (format,
-                   (NUMBERP (append)
-                    ? (NILP (Vwrite_region_verbose)
-                       ? "Updated `%s'"
-                       : nchars == 1
-                       ? "Updated `%s' (1 character)"
-                       : "Updated `%s' (%d characters)")
-                    : ! NILP (append)
-                    ? (NILP (Vwrite_region_verbose)
-                       ? "Added to `%s'"
-                       : nchars == 1
-                       ? "Added to `%s' (1 character)"
-                       : "Added to `%s' (%d characters)")
-                    : (NILP (Vwrite_region_verbose)
-                       ? "Wrote `%s'"
-                       : nchars == 1
-                       ? "Wrote `%s' (1 character)"
-                       : "Wrote `%s' (%d characters)")));
-      CALLN (Fmessage, format, visit_file, make_number (nchars));
-    }
+    message_with_string ((NUMBERP (append)
+                          ? "Updated %s"
+                          : ! NILP (append)
+                          ? "Added to %s"
+                          : "Wrote %s"),
+                         visit_file, 1);
+
   return Qnil;
 }
 
@@ -6142,11 +6126,6 @@ These are the annotations made by other annotation functions
 that were already called.  See also `write-region-annotate-functions'.  */);
   Vwrite_region_annotations_so_far = Qnil;
 
-  DEFVAR_LISP ("write-region-verbose",
-               Vwrite_region_verbose,
-               doc: /* If non-nil, be more verbose when writing a region.  */);
-  Vwrite_region_verbose = Qnil;
-
   DEFVAR_LISP ("inhibit-file-name-handlers", Vinhibit_file_name_handlers,
                doc: /* A list of file name handlers that temporarily should not be used.
 This applies only to the operation `inhibit-file-name-operation'.  */);