# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1216702569 0
# Node ID 936b47c046f006f800a7d82cf9cf5e50deb74f7d
# Parent  3b7098612be65458e651722e6a1f94e82ba0ba26
Remove sh-newline-and-indent

It is obsolete.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1346

diff -r 3b7098612be6 -r 936b47c046f0 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 22 04:39:27 2008 +0000
+++ b/lisp/ChangeLog	Tue Jul 22 04:56:09 2008 +0000
@@ -1,3 +1,8 @@
+2008-07-22  Miles Bader  <miles@gnu.org>
+
+	* progmodes/sh-script.el (sh-newline-and-indent): Remove.
+	(sh-mode-map): Remove remapping of newline-and-indent.
+
 2008-07-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* vc.el (Todo): Update.
@@ -7,7 +12,7 @@
 	* vc-git.el (vc-git-status-printer): Update the directory display
 	to match the default.
 
-	* vc-dir.el (vc-dir-recompute-file-state): Add workaround for CVS.	
+	* vc-dir.el (vc-dir-recompute-file-state): Add workaround for CVS.
 
 2008-07-21  Chong Yidong  <cyd@stupidchicken.com>
 
diff -r 3b7098612be6 -r 936b47c046f0 lisp/progmodes/sh-script.el
--- a/lisp/progmodes/sh-script.el	Tue Jul 22 04:39:27 2008 +0000
+++ b/lisp/progmodes/sh-script.el	Tue Jul 22 04:56:09 2008 +0000
@@ -475,7 +475,6 @@
     (define-key map "\"" 'skeleton-pair-insert-maybe)
 
     (define-key map [remap complete-tag] 'comint-dynamic-complete)
-    (define-key map [remap newline-and-indent] 'sh-newline-and-indent)
     (define-key map [remap delete-backward-char]
       'backward-delete-char-untabify)
     (define-key map "\C-c:" 'sh-set-shell)
@@ -1510,7 +1509,7 @@
 
 
 \\[backward-delete-char-untabify]	 Delete backward one position, even if it was a tab.
-\\[sh-newline-and-indent]	 Delete unquoted space and indent new line same as this one.
+\\[newline-and-indent]	 Delete unquoted space and indent new line same as this one.
 \\[sh-end-of-command]	 Go to end of successive commands.
 \\[sh-beginning-of-command]	 Go to beginning of successive commands.
 \\[sh-set-shell]	 Set this buffer's shell, and maybe its magic number.
@@ -3780,18 +3779,6 @@
 
 
 
-(defun sh-newline-and-indent ()
-  "Strip unquoted whitespace, insert newline, and indent like current line."
-  (interactive "*")
-  (indent-to (prog1 (current-indentation)
-	       (delete-region (point)
-			      (progn
-				(or (zerop (skip-chars-backward " \t"))
-				    (if (sh-quoted-p)
-					(forward-char)))
-				(point)))
-	       (newline))))
-
 (defun sh-beginning-of-command ()
   "Move point to successive beginnings of commands."
   (interactive)