[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e57f766 07/19: Merge from origin/emacs-24
From: |
Fabián Ezequiel Gallina |
Subject: |
[Emacs-diffs] master e57f766 07/19: Merge from origin/emacs-24 |
Date: |
Wed, 28 Jan 2015 04:50:10 +0000 |
branch: master
commit e57f766d3c97162258ec24b2b4986cdc0e98d352
Merge: 63efa6c 2a57b7e
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>
Merge from origin/emacs-24
2a57b7e Fixes: debbugs:18756
Conflicts:
lisp/ChangeLog
---
lisp/ChangeLog | 19 +++++++++++++++----
lisp/progmodes/sh-script.el | 7 +++----
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7322890..570e3e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,19 @@
+2015-01-04 Dmitry Gutov <address@hidden>
+
+ Unbreak `mouse-action' property in text buttons.
+
+ * button.el (push-button): Fix regression from 2012-12-06.
+
+2015-01-06 Glenn Morris <address@hidden>
+
+ * progmodes/sh-script.el (sh-mode): Doc fix.
+ (sh-basic-indent-line): Handle electric newline. (Bug#18756)
+
+2014-12-14 Steve Purcell <address@hidden> (tiny change)
+
2015-01-04 Paul Eggert <address@hidden>
- 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 <address@hidden>
@@ -1763,8 +1775,7 @@
2014-12-14 Steve Purcell <address@hidden> (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 <address@hidden>
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e8b6bf5..135f945 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -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 <address@hidden>
;; 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)
- [Emacs-diffs] master updated (2668ac1 -> 5491fd1), Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 4fc35ed 02/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 3a8b701 04/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 63efa6c 06/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master f4fcb10 08/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master d7a8981 05/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 32a2c91 10/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 358a8b3 12/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 0b2014f 03/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master e57f766 07/19: Merge from origin/emacs-24,
Fabián Ezequiel Gallina <=
- [Emacs-diffs] master b0edd7c 09/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 85ca476 14/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master f5ebe84 16/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 028ddef 18/19: Cleanup lisp/ChangeLog, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 4d0108a 11/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 294127e 13/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 5491fd1 19/19: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 33ab7ee 15/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 8e9166c 01/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 95a2cb2 17/19: Merge from origin/emacs-24, Fabián Ezequiel Gallina, 2015/01/27