Commit e57f766d authored by Fabián Ezequiel Gallina's avatar Fabián Ezequiel Gallina

Merge from origin/emacs-24

2a57b7e5 Fixes: debbugs:18756

Conflicts:
	lisp/ChangeLog
parents 63efa6c6 2a57b7e5
2015-01-04 Dmitry Gutov <dgutov@yandex.ru>
Unbreak `mouse-action' property in text buttons.
* button.el (push-button): Fix regression from 2012-12-06.
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)
2015-01-04 Paul Eggert <eggert@cs.ucla.edu>
Fix dired quoting bug with "Hit`N`Hide"
Fixes Bug#19498.
Fix dired quoting bug with "Hit`N`Hide". Fixes Bug#19498.
* files.el (shell-quote-wildcard-pattern): Also quote "`".
2015-01-27 Katsumi Yamaoka <yamaoka@jpl.org>
......@@ -1763,8 +1775,7 @@
2014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change)
* emacs-lisp/package.el (package-menu-mode): Use an extra column
for the "Version" column, to accomodate date-and-time-based
versions.
for the "Version" column, to accomodate date-and-time-based versions.
2014-12-14 Cameron Desautels <camdez@gmail.com>
......
;;; 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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment