require-final-newline now initialized by mode-require-final-newline

(previous version using *symbol* was wrong in any case) git-svn-id: https://svn.r-project.org/ESS/trunk@6025 0bbaf3bd-34e0-0310-bf65-c717079852d4
linls1912 · Aug 13, 2014 · 4331544 · 4331544
1 parent 2053dd9
commit 4331544
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/lisp/ess-custom.el b/lisp/ess-custom.el
@@ -551,11 +551,12 @@ incorrectly, the right things will probably still happen, however."
   :group 'ess-edit
   :type 'boolean)
 
-(defcustom ess-require-final-newline t
-  "*Will be used to set `require-final-newline' in several <language>-editing-alist.
-The default (t) is desirable for several (unix/GNU) text tools."
-  :group 'ess-edit
-  :type 'boolean)
+;; rather use  standard Emacs   mode-require-final-newline !
+;; (defcustom ess-require-final-newline t
+;;   "*Will be used to set `require-final-newline' in several <language>-editing-alist.
+;; The default (t) is desirable for several (unix/GNU) text tools."
+;;   :group 'ess-edit
+;;   :type 'boolean)
 
 ;;; SJE -- this is set in ess-site.el to be "always", so I changed
 ;;; value t to be "always", so that ess-site.el does not need editing.

diff --git a/lisp/ess-gretl.el b/lisp/ess-gretl.el
@@ -417,7 +417,7 @@ end keywords as associated values.")
   '((paragraph-start		  . (concat "\\s-*$\\|" page-delimiter))
     (paragraph-separate		  . (concat "\\s-*$\\|" page-delimiter))
     (paragraph-ignore-fill-prefix . t)
-    (require-final-newline	  . 'ess-require-final-newline)
+    (require-final-newline	  . mode-require-final-newline)
     (comment-start		  . "# ")
     (comment-add                  . 1)
     (comment-start-skip		  . "\\s<+\\s-*")
@@ -476,7 +476,7 @@ end keywords as associated values.")
            (gretl--get-words-from-command "help functions\n" "Accessors:" "^Functions")
            (gretl--get-words-from-command "help functions\n" "^Functions" "^For")
            )))
-  
+
 ;; (defvar ess-gretl-error-regexp-alist '(gretl-in gretl-at)
 ;;   "List of symbols which are looked up in `compilation-error-regexp-alist-alist'.")
 
@@ -602,7 +602,7 @@ to gretl, put them in the variable `inferior-gretl-args'."
 				 inferior-gretl-args
 				 "'] ? "))
 		      nil))))
-      (inferior-ess r-start-args) 
+      (inferior-ess r-start-args)
       (set (make-local-variable 'indent-line-function) 'gretl-indent-line)
       (set (make-local-variable 'gretl-basic-offset) 4)
       (setq indent-tabs-mode nil)

diff --git a/lisp/ess-julia.el b/lisp/ess-julia.el
@@ -231,7 +231,7 @@ Do not move back beyond MIN."
   '((paragraph-start		  . (concat "\\s-*$\\|" page-delimiter))
     (paragraph-separate		  . (concat "\\s-*$\\|" page-delimiter))
     (paragraph-ignore-fill-prefix . t)
-    (require-final-newline	  . 'ess-require-final-newline)
+    (require-final-newline	  . mode-require-final-newline)
     (comment-start		  . "# ")
     (comment-add                  . 1)
     (comment-start-skip		  . "#+\\s-*")

diff --git a/lisp/ess-lsp-l.el b/lisp/ess-lsp-l.el
@@ -47,7 +47,7 @@
     (adaptive-fill-mode           . nil)
     (indent-line-function         . 'lisp-indent-line)
     (indent-region-function       . 'lisp-indent-region)
-    (require-final-newline        . 'ess-require-final-newline)
+    (require-final-newline        . mode-require-final-newline)
     (comment-start                . ";")
     (comment-start-skip           . "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
     (comment-column               . 40)

diff --git a/lisp/ess-omg-l.el b/lisp/ess-omg-l.el
@@ -254,7 +254,7 @@
   '((paragraph-start              . (concat "^$\\|" page-delimiter))
     (paragraph-separate           . (concat "^$\\|" page-delimiter))
     (paragraph-ignore-fill-prefix . t)
-    (require-final-newline        . 'ess-require-final-newline)
+    (require-final-newline        . mode-require-final-newline)
     (comment-start                . "//")
     (comment-start-skip           . "//+ *")
     (comment-column               . 40)

diff --git a/lisp/ess-s-l.el b/lisp/ess-s-l.el
@@ -70,7 +70,7 @@
   '((paragraph-start              . (concat "\\s-*$\\|" page-delimiter))
     (paragraph-separate           . (concat "\\s-*$\\|" page-delimiter))
     (paragraph-ignore-fill-prefix . t)
-    (require-final-newline        . 'ess-require-final-newline)
+    (require-final-newline        . mode-require-final-newline)
     ;;(comment-indent-function  . 'S-comment-indent)
     ;;(ess-comment-indent           . 'S-comment-indent)
     ;;(ess-indent-line                      . 'S-indent-line)

diff --git a/lisp/ess-sas-l.el b/lisp/ess-sas-l.el
@@ -807,7 +807,7 @@ number."
     (adaptive-fill-mode           . nil)
     (indent-line-function         . 'sas-indent-line)
     ;;(indent-region-function       . 'sas-indent-region)
-    (require-final-newline        . 'ess-require-final-newline)
+    (require-final-newline        . mode-require-final-newline)
     (comment-start                . "/*")
     (comment-start-skip           . "/[*]")
     (comment-end                  . "*/")

diff --git a/lisp/ess-sta-l.el b/lisp/ess-sta-l.el
@@ -1130,7 +1130,7 @@ ado-mode of Bill Rising <[email protected]>, and uses make-regexp."
   '((paragraph-start              . (concat "[ \t\f]*$\\|" page-delimiter))
     (paragraph-separate           . (concat  "[ \t\f]*$\\|" page-delimiter))
     (paragraph-ignore-fill-prefix . t)
-    (require-final-newline        . 'ess-require-final-newline)
+    (require-final-newline        . mode-require-final-newline)
     (comment-column               . 40)
     ;;(comment-indent-function      . 'S-comment-indent)
     ;;(ess-comment-indent           . 'S-comment-indent)