# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1104505041 0
# Node ID 84ede35ffeb40146b548995f879887822bd948e3
# Parent  54d81a8baaa603af3d754e9e3b6974b137f67d4d
(sh-require-final-newline):
Alist value now controls whether to use mode-require-final-newline.
(sh-set-shell): Implement that new meaning.

diff -r 54d81a8baaa6 -r 84ede35ffeb4 lisp/progmodes/sh-script.el
--- a/lisp/progmodes/sh-script.el	Fri Dec 31 14:55:23 2004 +0000
+++ b/lisp/progmodes/sh-script.el	Fri Dec 31 14:57:21 2004 +0000
@@ -495,10 +495,9 @@
 
 (defcustom sh-require-final-newline
   '((csh . t)
-    (pdksh . t)
-    (rc . require-final-newline)
-    (sh . require-final-newline))
+    (pdksh . t))
   "*Value of `require-final-newline' in Shell-Script mode buffers.
+\(SHELL . t) means use the value of `mode-require-final-newline' for SHELL.
 See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
 		       (choice (const :tag "require" t)
@@ -1485,8 +1484,8 @@
 	    (executable-set-magic shell (sh-feature sh-shell-arg)
 				  no-query-flag insert-flag)))
   (let ((tem (sh-feature sh-require-final-newline)))
-    (unless (eq tem 'require-final-newline)
-      (setq require-final-newline tem)))
+    (if (eq tem t)
+	(setq require-final-newline mode-require-final-newline)))
   (setq
 	comment-start-skip "#+[\t ]*"
 	local-abbrev-table sh-mode-abbrev-table