mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-24

Browse source 
2a57b7e Fixes: debbugs:18756

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Fabián Ezequiel Gallina 2015-01-28 01:03:22 -03:00
commit e57f766d3c
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
;;; sh-script.el --- shell-script editing commands for Emacs -*- lexical-binding:t -*-
;; Copyright (C) 1993-1997, 1999, 2001-2015 Free Software Foundation,
;; Inc.
;; Copyright (C) 1993-1997, 1999, 2001-2015 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Version: 2.0f
@ -1599,7 +1598,6 @@ buffer indents as it currently is indented.
\\[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-beginning-of-command] Go to beginning of successive commands.
\\[sh-set-shell] Set this buffer's shell, and maybe its magic number.
@ -2501,7 +2499,8 @@ Lines containing only comments are considered empty."
(current-column)))
current)
(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
(if (< (current-column)
(setq current (progn (back-to-indentation)