[Emacs-diffs] Changes to emacs/lisp/progmodes/sh-script.el

[Richard M . Stallman]

Index: emacs/lisp/progmodes/sh-script.el
diff -c emacs/lisp/progmodes/sh-script.el:1.142 
emacs/lisp/progmodes/sh-script.el:1.143
*** emacs/lisp/progmodes/sh-script.el:1.142     Sun Dec  5 14:19:38 2004
--- emacs/lisp/progmodes/sh-script.el   Fri Dec 31 14:57:21 2004
***************
*** 495,504 ****
  
  (defcustom sh-require-final-newline
    '((csh . t)
!     (pdksh . t)
!     (rc . require-final-newline)
!     (sh . require-final-newline))
    "*Value of `require-final-newline' in Shell-Script mode buffers.
  See `sh-feature'."
    :type '(repeat (cons (symbol :tag "Shell")
                       (choice (const :tag "require" t)
--- 495,503 ----
  
  (defcustom sh-require-final-newline
    '((csh . t)
!     (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,1492 ****
            (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)))
    (setq
        comment-start-skip "#+[\t ]*"
        local-abbrev-table sh-mode-abbrev-table
--- 1484,1491 ----
            (executable-set-magic shell (sh-feature sh-shell-arg)
                                  no-query-flag insert-flag)))
    (let ((tem (sh-feature sh-require-final-newline)))
!     (if (eq tem t)
!       (setq require-final-newline mode-require-final-newline)))
    (setq
        comment-start-skip "#+[\t ]*"
        local-abbrev-table sh-mode-abbrev-table