procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/callproc.c (call_process): Don't check read-only if we don't insert

Browse source 
anything.

Fixes: debbugs:17666
This commit is contained in:
Stefan Monnier 2014-06-02 14:42:07 -04:00
parent 834dee2099
commit c4e6b585bb
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-06-02 Stefan Monnier <monnier@iro.umontreal.ca>
* callproc.c (call_process): Don't check read-only if we don't insert
anything (bug#17666).
2014-06-02 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (update_frame_with_menu): Set display_completed.

7
src/callproc.c
View file

@ -826,8 +826,10 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
/* Now NREAD is the total amount of data in the buffer. */
immediate_quit = 0;
if (NILP (BVAR (current_buffer, enable_multibyte_characters))
&& ! CODING_MAY_REQUIRE_DECODING (&process_coding))
if (!nread)
;
else if (NILP (BVAR (current_buffer, enable_multibyte_characters))
&& ! CODING_MAY_REQUIRE_DECODING (&process_coding))
insert_1_both (buf, nread, nread, 0, 1, 0);
else
{ /* We have to decode the input. */
@ -835,6 +837,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
ptrdiff_t count1 = SPECPDL_INDEX ();
XSETBUFFER (curbuf, current_buffer);
/* FIXME: Call signal_after_change! */
prepare_to_modify_buffer (PT, PT, NULL);
/* We cannot allow after-change-functions be run
during decoding, because that might modify the