aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-07-10 11:10:27 +0800
committerLeo Liu2013-07-10 11:10:27 +0800
commit56973319b58a66e97ae45e050f9f943ff8f1439b (patch)
tree5d5cb664a55b423c4995dacf784af19add24ffd5
parent2aae948de5bf1ceda23c06310b331166532078e6 (diff)
downloademacs-56973319b58a66e97ae45e050f9f943ff8f1439b.tar.gz
emacs-56973319b58a66e97ae45e050f9f943ff8f1439b.zip
* files.el (require-final-newline): Allow safe local value.
Fixes: debbugs:14834
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f79c8f0e692..3b7d95837b0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-07-10 Leo Liu <sdl.web@gmail.com>
2
3 * files.el (require-final-newline): Allow safe local value.
4 (Bug#14834)
5
12013-07-09 Leo Liu <sdl.web@gmail.com> 62013-07-09 Leo Liu <sdl.web@gmail.com>
2 7
3 * ido.el (ido-read-directory-name): Handle fallback. 8 * ido.el (ido-read-directory-name): Handle fallback.
diff --git a/lisp/files.el b/lisp/files.el
index 9b56dfa9693..a8ccf81fa17 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -316,12 +316,14 @@ A value of nil means don't add newlines.
316 316
317Certain major modes set this locally to the value obtained 317Certain major modes set this locally to the value obtained
318from `mode-require-final-newline'." 318from `mode-require-final-newline'."
319 :safe #'symbolp
319 :type '(choice (const :tag "When visiting" visit) 320 :type '(choice (const :tag "When visiting" visit)
320 (const :tag "When saving" t) 321 (const :tag "When saving" t)
321 (const :tag "When visiting or saving" visit-save) 322 (const :tag "When visiting or saving" visit-save)
322 (const :tag "Don't add newlines" nil) 323 (const :tag "Don't add newlines" nil)
323 (other :tag "Ask each time" ask)) 324 (other :tag "Ask each time" ask))
324 :group 'editing-basics) 325 :group 'editing-basics
326 :version "24.4")
325 327
326(defcustom mode-require-final-newline t 328(defcustom mode-require-final-newline t
327 "Whether to add a newline at end of file, in certain major modes. 329 "Whether to add a newline at end of file, in certain major modes.