aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorAndrea Corallo2021-01-16 13:26:10 +0100
committerAndrea Corallo2021-01-16 13:26:10 +0100
commit0a7ac0b5504e75275699a3d8d2d5d94bcfda8708 (patch)
treebb6158c8a9edeb1e716718abfc98dca16aef9e9e /src/data.c
parentf1efac1f9efbfa15b6434ebef507c00c1277633f (diff)
parent0732fc31932c75c682c8b65b4dcb4376ca63e8fd (diff)
downloademacs-0a7ac0b5504e75275699a3d8d2d5d94bcfda8708.tar.gz
emacs-0a7ac0b5504e75275699a3d8d2d5d94bcfda8708.zip
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/data.c b/src/data.c
index 3cf5bbbdd56..0dc21c8c2a1 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3834,6 +3834,7 @@ syms_of_data (void)
3834 DEFSYM (Qbuffer_read_only, "buffer-read-only"); 3834 DEFSYM (Qbuffer_read_only, "buffer-read-only");
3835 DEFSYM (Qtext_read_only, "text-read-only"); 3835 DEFSYM (Qtext_read_only, "text-read-only");
3836 DEFSYM (Qmark_inactive, "mark-inactive"); 3836 DEFSYM (Qmark_inactive, "mark-inactive");
3837 DEFSYM (Qinhibited_interaction, "inhibited-interaction");
3837 3838
3838 DEFSYM (Qlistp, "listp"); 3839 DEFSYM (Qlistp, "listp");
3839 DEFSYM (Qconsp, "consp"); 3840 DEFSYM (Qconsp, "consp");
@@ -3918,6 +3919,8 @@ syms_of_data (void)
3918 PUT_ERROR (Qbuffer_read_only, error_tail, "Buffer is read-only"); 3919 PUT_ERROR (Qbuffer_read_only, error_tail, "Buffer is read-only");
3919 PUT_ERROR (Qtext_read_only, pure_cons (Qbuffer_read_only, error_tail), 3920 PUT_ERROR (Qtext_read_only, pure_cons (Qbuffer_read_only, error_tail),
3920 "Text is read-only"); 3921 "Text is read-only");
3922 PUT_ERROR (Qinhibited_interaction, error_tail,
3923 "User interaction while inhibited");
3921 3924
3922 DEFSYM (Qrange_error, "range-error"); 3925 DEFSYM (Qrange_error, "range-error");
3923 DEFSYM (Qdomain_error, "domain-error"); 3926 DEFSYM (Qdomain_error, "domain-error");