Remove sh-newline-and-indent

It is obsolete.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d26d6e0..729c085 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index f733ccb..27dbbb4 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -475,7 +475,6 @@ This is buffer-local in every such buffer.")
     (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 @@ buffer indents as it currently is indented.
 
 
 \\[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 @@ The document is bounded by `sh-here-document-word'."
 
 
 
-(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)