procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes: debbugs:18756

Browse source 
sh-basic-indent-line fix

* lisp/progmodes/sh-script.el (sh-mode): Doc fix.
(sh-basic-indent-line): Handle electric newline.
This commit is contained in:
Glenn Morris 2015-01-06 13:52:15 -05:00
parent 4e86e02951
commit 2a57b7e5b4
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -1,19 +1,21 @@
2015-01-06 Glenn Morris <rgm@gnu.org>
* progmodes/sh-script.el (sh-mode): Doc fix.
(sh-basic-indent-line): Handle electric newline. (Bug#18756)
2014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change) 2014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change)
* emacs-lisp/package.el (package-menu-mode): Use an extra column * emacs-lisp/package.el (package-menu-mode): Use an extra column
for the "Version" column, to accomodate date-and-time-based for the "Version" column, to accomodate date-and-time-based versions.
versions.
2015-01-04 Paul Eggert <eggert@cs.ucla.edu> 2015-01-04 Paul Eggert <eggert@cs.ucla.edu>
Fix dired quoting bug with "Hit`N`Hide" Fix dired quoting bug with "Hit`N`Hide". Fixes Bug#19498.
Fixes Bug#19498.
* files.el (shell-quote-wildcard-pattern): Also quote "`". * files.el (shell-quote-wildcard-pattern): Also quote "`".
2015-01-04 Dmitry Gutov <dgutov@yandex.ru> 2015-01-04 Dmitry Gutov <dgutov@yandex.ru>
Unbreak `mouse-action' property in text buttons. Unbreak `mouse-action' property in text buttons.
* button.el (push-button): Fix regression from 2012-12-06. * button.el (push-button): Fix regression from 2012-12-06.
2015-01-01 Eli Zaretskii <eliz@gnu.org> 2015-01-01 Eli Zaretskii <eliz@gnu.org>

7
lisp/progmodes/sh-script.el
View file

@ -1,7 +1,6 @@
;;; sh-script.el --- shell-script editing commands for Emacs -*- lexical-binding:t -*- ;;; sh-script.el --- shell-script editing commands for Emacs -*- lexical-binding:t -*-
;; Copyright (C) 1993-1997, 1999, 2001-2015 Free Software Foundation, ;; Copyright (C) 1993-1997, 1999, 2001-2015 Free Software Foundation, Inc.
;; Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Version: 2.0f ;; Version: 2.0f
@ -1575,7 +1574,6 @@ buffer indents as it currently is indented.
\\[backward-delete-char-untabify] Delete backward one position, even if it was a tab. \\[backward-delete-char-untabify] Delete backward one position, even if it was a tab.
\\[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-end-of-command] Go to end of successive commands.
\\[sh-beginning-of-command] Go to beginning 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. \\[sh-set-shell] Set this buffer's shell, and maybe its magic number.
@ -2477,7 +2475,8 @@ Lines containing only comments are considered empty."
(current-column))) (current-column)))
current) current)
(save-excursion (save-excursion
(indent-to (if (eq this-command 'newline-and-indent) (indent-to (if (or (eq this-command 'newline-and-indent)
(and electric-indent-mode (eq this-command 'newline)))
previous previous
(if (< (current-column) (if (< (current-column)
(setq current (progn (back-to-indentation) (setq current (progn (back-to-indentation)