From: Noam Postavsky <npostavs@gmail.com>
Date: Tue, 20 Dec 2016 01:16:50 +0000 (-0500)
Subject: Remove sh-mode's skeleton-end-hook
X-Git-Tag: emacs-26.0.90~953
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5da2a5f449cd0c8f16f2244c90b57e27ca373892;p=emacs.git

Remove sh-mode's skeleton-end-hook

* lisp/progmodes/sh-script.el (sh-mode): Remove local setting of
`skeleton-end-hook', `skeleton-insert' already does `newline-and-indent'
and also respects `skeleton-end-newline' (Bug#16634).
---

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index da0819e1071..a0bbf55a8f4 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1629,8 +1629,6 @@ with your script for an edit-interpret-debug cycle."
 
   (setq-local skeleton-pair-default-alist
 	      sh-skeleton-pair-default-alist)
-  (setq-local skeleton-end-hook
-	      (lambda () (or (eolp) (newline) (indent-relative))))
 
   (setq-local paragraph-start (concat page-delimiter "\\|$"))
   (setq-local paragraph-separate (concat paragraph-start "\\|#!/"))