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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/07/22 04:56:10

Index: progmodes/sh-script.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- progmodes/sh-script.el      27 Jun 2008 02:23:33 -0000      1.214
+++ progmodes/sh-script.el      22 Jul 2008 04:56:09 -0000      1.215
@@ -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)