diff options
| author | Richard M. Stallman | 2002-05-28 20:25:46 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-05-28 20:25:46 +0000 |
| commit | bf3428a1e41d32f256bfa89f5da6b8e95f36d956 (patch) | |
| tree | 9e4041682f1ec39a2b3d3a0812ea3628d463e540 /src | |
| parent | 2520dc0caa5fd0cd7ff221ea9d4fe86d8623efac (diff) | |
| download | emacs-bf3428a1e41d32f256bfa89f5da6b8e95f36d956.tar.gz emacs-bf3428a1e41d32f256bfa89f5da6b8e95f36d956.zip | |
(Fwrite_region): If START is a string, don't make any annotations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/fileio.c b/src/fileio.c index 2f658f9bee0..4999e284c84 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4827,11 +4827,16 @@ This does code conversion according to the value of | |||
| 4827 | count1 = specpdl_ptr - specpdl; | 4827 | count1 = specpdl_ptr - specpdl; |
| 4828 | 4828 | ||
| 4829 | given_buffer = current_buffer; | 4829 | given_buffer = current_buffer; |
| 4830 | annotations = build_annotations (start, end); | 4830 | |
| 4831 | if (current_buffer != given_buffer) | 4831 | if (!STRINGP (start)) |
| 4832 | { | 4832 | { |
| 4833 | XSETFASTINT (start, BEGV); | 4833 | annotations = build_annotations (start, end); |
| 4834 | XSETFASTINT (end, ZV); | 4834 | |
| 4835 | if (current_buffer != given_buffer) | ||
| 4836 | { | ||
| 4837 | XSETFASTINT (start, BEGV); | ||
| 4838 | XSETFASTINT (end, ZV); | ||
| 4839 | } | ||
| 4835 | } | 4840 | } |
| 4836 | 4841 | ||
| 4837 | UNGCPRO; | 4842 | UNGCPRO; |
| @@ -4847,12 +4852,15 @@ This does code conversion according to the value of | |||
| 4847 | Vlast_coding_system_used = coding.symbol; | 4852 | Vlast_coding_system_used = coding.symbol; |
| 4848 | 4853 | ||
| 4849 | given_buffer = current_buffer; | 4854 | given_buffer = current_buffer; |
| 4850 | annotations = build_annotations_2 (start, end, | 4855 | if (! STRINGP (start)) |
| 4851 | coding.pre_write_conversion, annotations); | ||
| 4852 | if (current_buffer != given_buffer) | ||
| 4853 | { | 4856 | { |
| 4854 | XSETFASTINT (start, BEGV); | 4857 | annotations = build_annotations_2 (start, end, |
| 4855 | XSETFASTINT (end, ZV); | 4858 | coding.pre_write_conversion, annotations); |
| 4859 | if (current_buffer != given_buffer) | ||
| 4860 | { | ||
| 4861 | XSETFASTINT (start, BEGV); | ||
| 4862 | XSETFASTINT (end, ZV); | ||
| 4863 | } | ||
| 4856 | } | 4864 | } |
| 4857 | 4865 | ||
| 4858 | #ifdef CLASH_DETECTION | 4866 | #ifdef CLASH_DETECTION |