aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorStephen Leake2019-04-11 14:00:02 -0700
committerStephen Leake2019-04-11 14:00:02 -0700
commit7ba7def5caf7ec9d9bebffff489f0a658229fbda (patch)
treee0cfcb59937ca0528fb81769d7d48a904a91f5dc /src/buffer.c
parent7768581172e11be52b1fcd8224f4594e126bbdb7 (diff)
parentde238b39e335c6814283faa171b35145f124edf2 (diff)
downloademacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.tar.gz
emacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.zip
Merge commit 'de238b39e335c6814283faa171b35145f124edf2'
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c
index c0f7521c9e1..ab477481912 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -584,10 +584,10 @@ even if it is dead. The return value is never nil. */)
584 set_string_intervals (name, NULL); 584 set_string_intervals (name, NULL);
585 bset_name (b, name); 585 bset_name (b, name);
586 586
587 if (STRINGP (Vcode_conversion_workbuf_name) 587 b->inhibit_buffer_hooks
588 && strncmp (SSDATA (name), SSDATA (Vcode_conversion_workbuf_name), 588 = (STRINGP (Vcode_conversion_workbuf_name)
589 SBYTES (Vcode_conversion_workbuf_name)) == 0) 589 && strncmp (SSDATA (name), SSDATA (Vcode_conversion_workbuf_name),
590 b->inhibit_buffer_hooks = true; 590 SBYTES (Vcode_conversion_workbuf_name)) == 0);
591 591
592 bset_undo_list (b, SREF (name, 0) != ' ' ? Qnil : Qt); 592 bset_undo_list (b, SREF (name, 0) != ' ' ? Qnil : Qt);
593 593