diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 35 |
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, | |||
| 5150 | } | 5150 | } |
| 5151 | 5151 | ||
| 5152 | if (!auto_saving && !noninteractive) | 5152 | if (!auto_saving && !noninteractive) |
| 5153 | { | 5153 | message_with_string ((NUMBERP (append) |
| 5154 | EMACS_INT nchars = (STRINGP (start) ? SCHARS (start) | 5154 | ? "Updated %s" |
| 5155 | : XINT (end) - XINT (start)); | 5155 | : ! NILP (append) |
| 5156 | AUTO_STRING (format, | 5156 | ? "Added to %s" |
| 5157 | (NUMBERP (append) | 5157 | : "Wrote %s"), |
| 5158 | ? (NILP (Vwrite_region_verbose) | 5158 | visit_file, 1); |
| 5159 | ? "Updated `%s'" | 5159 | |
| 5160 | : nchars == 1 | ||
| 5161 | ? "Updated `%s' (1 character)" | ||
| 5162 | : "Updated `%s' (%d characters)") | ||
| 5163 | : ! NILP (append) | ||
| 5164 | ? (NILP (Vwrite_region_verbose) | ||
| 5165 | ? "Added to `%s'" | ||
| 5166 | : nchars == 1 | ||
| 5167 | ? "Added to `%s' (1 character)" | ||
| 5168 | : "Added to `%s' (%d characters)") | ||
| 5169 | : (NILP (Vwrite_region_verbose) | ||
| 5170 | ? "Wrote `%s'" | ||
| 5171 | : nchars == 1 | ||
| 5172 | ? "Wrote `%s' (1 character)" | ||
| 5173 | : "Wrote `%s' (%d characters)"))); | ||
| 5174 | CALLN (Fmessage, format, visit_file, make_number (nchars)); | ||
| 5175 | } | ||
| 5176 | return Qnil; | 5160 | return Qnil; |
| 5177 | } | 5161 | } |
| 5178 | 5162 | ||
| @@ -6142,11 +6126,6 @@ These are the annotations made by other annotation functions | |||
| 6142 | that were already called. See also `write-region-annotate-functions'. */); | 6126 | that were already called. See also `write-region-annotate-functions'. */); |
| 6143 | Vwrite_region_annotations_so_far = Qnil; | 6127 | Vwrite_region_annotations_so_far = Qnil; |
| 6144 | 6128 | ||
| 6145 | DEFVAR_LISP ("write-region-verbose", | ||
| 6146 | Vwrite_region_verbose, | ||
| 6147 | doc: /* If non-nil, be more verbose when writing a region. */); | ||
| 6148 | Vwrite_region_verbose = Qnil; | ||
| 6149 | |||
| 6150 | DEFVAR_LISP ("inhibit-file-name-handlers", Vinhibit_file_name_handlers, | 6129 | DEFVAR_LISP ("inhibit-file-name-handlers", Vinhibit_file_name_handlers, |
| 6151 | doc: /* A list of file name handlers that temporarily should not be used. | 6130 | doc: /* A list of file name handlers that temporarily should not be used. |
| 6152 | This applies only to the operation `inhibit-file-name-operation'. */); | 6131 | This applies only to the operation `inhibit-file-name-operation'. */); |