1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00

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.
This commit is contained in:
Noam Postavsky 2017-05-08 22:17:53 -04:00
parent 5e2cf8c804
commit daaec72a82
13 changed files with 21 additions and 131 deletions

View file

@ -39,7 +39,6 @@
(require 'dired)
(require 'ert)
(require 'ert-x)
(require 'tramp)
(require 'vc)
(require 'vc-bzr)
@ -81,9 +80,6 @@
(when (getenv "NIX_STORE")
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))
(defvar tramp--test-messages nil
"Captured messages from *Messages* buffer.")
(defvar tramp--test-expensive-test
(null
(string-equal (getenv "SELECTOR") "(quote (not (tag :expensive-test)))"))
@ -1745,77 +1741,31 @@ This checks also `file-name-as-directory', `file-name-directory',
(skip-unless (tramp--test-enabled))
(dolist (quoted (if tramp--test-expensive-test '(nil t) '(nil)))
(let* ((tmp-name (tramp--test-make-temp-name nil quoted))
(text-quoting-style 'grave)
(write-region-verbose
(and (null noninteractive) (boundp 'write-region-verbose)))
(tramp-message-show-message
(or tramp-message-show-message write-region-verbose)))
(let ((tmp-name (tramp--test-make-temp-name nil quoted)))
(unwind-protect
(ert-with-message-capture tramp--test-messages
;; Write buffer.
(setq tramp--test-messages "")
(progn
(with-temp-buffer
(insert "foo")
(write-region nil nil tmp-name))
(when write-region-verbose
(should
(string-match
(format "Wrote `%s' (3 characters)" tmp-name)
tramp--test-messages)))
(with-temp-buffer
(insert-file-contents tmp-name)
(should (string-equal (buffer-string) "foo")))
;; Append.
(setq tramp--test-messages "")
(with-temp-buffer
(insert "bla")
(write-region nil nil tmp-name 'append))
(when write-region-verbose
(should
(string-match
(format "Added to `%s' (3 characters)" tmp-name)
tramp--test-messages)))
(with-temp-buffer
(insert-file-contents tmp-name)
(should (string-equal (buffer-string) "foobla")))
(setq tramp--test-messages "")
(with-temp-buffer
(insert "baz")
(write-region nil nil tmp-name 3))
(when write-region-verbose
(should
(string-match
(format "Updated `%s' (3 characters)" tmp-name)
tramp--test-messages)))
(with-temp-buffer
(insert-file-contents tmp-name)
(should (string-equal (buffer-string) "foobaz")))
;; Write string.
(setq tramp--test-messages "")
(write-region "foo" nil tmp-name)
(when write-region-verbose
(should
(string-match
(format "Wrote `%s' (3 characters)" tmp-name)
tramp--test-messages)))
(with-temp-buffer
(insert-file-contents tmp-name)
(should (string-equal (buffer-string) "foo")))
;; Write partly.
(setq tramp--test-messages "")
(with-temp-buffer
(insert "123456789")
(write-region 3 5 tmp-name))
(when write-region-verbose
(should
(string-match
(format "Wrote `%s' (2 characters)" tmp-name)
tramp--test-messages)))
(with-temp-buffer
(insert-file-contents tmp-name)
(should (string-equal (buffer-string) "34"))))