aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorAndrea Corallo2020-04-06 18:06:29 +0100
committerAndrea Corallo2020-04-06 18:06:29 +0100
commit4abb8c822ce02cf33712bd2699c5b77a5db49e31 (patch)
tree7520e3cae0f9a958ae223161034ebee6b5aa9e63 /src/buffer.c
parent32a079aef290fdc8913c1ce4e8910e63e6ff6dcc (diff)
parent3dc2f50e5bf9f58aee23fd6c61c02fadc240a377 (diff)
downloademacs-4abb8c822ce02cf33712bd2699c5b77a5db49e31.tar.gz
emacs-4abb8c822ce02cf33712bd2699c5b77a5db49e31.zip
Merge remote-tracking branch 'savannah/master' into HEAD
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 d8842a6d770..f3532a86189 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6236,10 +6236,10 @@ Lisp programs may give this variable certain special values:
6236 6236
6237 DEFVAR_LISP ("inhibit-read-only", Vinhibit_read_only, 6237 DEFVAR_LISP ("inhibit-read-only", Vinhibit_read_only,
6238 doc: /* Non-nil means disregard read-only status of buffers or characters. 6238 doc: /* Non-nil means disregard read-only status of buffers or characters.
6239If the value is t, disregard `buffer-read-only' and all `read-only' 6239A non-nil value that is a list means disregard `buffer-read-only' status,
6240text properties. If the value is a list, disregard `buffer-read-only' 6240and disregard a `read-only' text property if the property value is a
6241and disregard a `read-only' text property if the property value 6241member of the list. Any other non-nil value means disregard `buffer-read-only'
6242is a member of the list. */); 6242and all `read-only' text properties. */);
6243 Vinhibit_read_only = Qnil; 6243 Vinhibit_read_only = Qnil;
6244 6244
6245 DEFVAR_PER_BUFFER ("cursor-type", &BVAR (current_buffer, cursor_type), Qnil, 6245 DEFVAR_PER_BUFFER ("cursor-type", &BVAR (current_buffer, cursor_type), Qnil,