aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-11-22 16:36:07 -0500
committerGlenn Morris2017-11-22 16:36:07 -0500
commited2c542920da2a0d99de01e863cbd4ab7dfe13d7 (patch)
treed88b4c6b08e5f229fe91491f3ed49b38badec4cf
parentd82474e45294ab414d63dd70a987bc399eeb9761 (diff)
downloademacs-ed2c542920da2a0d99de01e863cbd4ab7dfe13d7.tar.gz
emacs-ed2c542920da2a0d99de01e863cbd4ab7dfe13d7.zip
* lisp/bindings.el (buffer-file-coding-system):
Add explicit permanent-local mark. ; * src/buffer.c (init_buffer_once): Comment.
-rw-r--r--lisp/bindings.el4
-rw-r--r--src/buffer.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 3a679f778ab..2b664044de8 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -689,6 +689,7 @@ okay. See `mode-line-format'.")
689;; `kill-all-local-variables', because they have no default value. 689;; `kill-all-local-variables', because they have no default value.
690;; For consistency, we give them the `permanent-local' property, even 690;; For consistency, we give them the `permanent-local' property, even
691;; though `kill-all-local-variables' does not actually consult it. 691;; though `kill-all-local-variables' does not actually consult it.
692;; See init_buffer_once in buffer.c for the origins of this list.
692 693
693(mapc (lambda (sym) (put sym 'permanent-local t)) 694(mapc (lambda (sym) (put sym 'permanent-local t))
694 '(buffer-file-name default-directory buffer-backed-up 695 '(buffer-file-name default-directory buffer-backed-up
@@ -697,7 +698,8 @@ okay. See `mode-line-format'.")
697 point-before-scroll buffer-file-truename 698 point-before-scroll buffer-file-truename
698 buffer-file-format buffer-auto-save-file-format 699 buffer-file-format buffer-auto-save-file-format
699 buffer-display-count buffer-display-time 700 buffer-display-count buffer-display-time
700 enable-multibyte-characters)) 701 enable-multibyte-characters
702 buffer-file-coding-system))
701 703
702;; We have base64, md5 and sha1 functions built in now. 704;; We have base64, md5 and sha1 functions built in now.
703(provide 'base64) 705(provide 'base64)
diff --git a/src/buffer.c b/src/buffer.c
index 4ae5e811b07..d1c41380188 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5079,6 +5079,8 @@ init_buffer_once (void)
5079{ 5079{
5080 int idx; 5080 int idx;
5081 5081
5082 /* Items flagged permanent get an explicit permanent-local property
5083 added in bindings.el, for clarity. */
5082 memset (buffer_permanent_local_flags, 0, sizeof buffer_permanent_local_flags); 5084 memset (buffer_permanent_local_flags, 0, sizeof buffer_permanent_local_flags);
5083 5085
5084 /* 0 means not a lisp var, -1 means always local, else mask. */ 5086 /* 0 means not a lisp var, -1 means always local, else mask. */