From: Sam Steingold <sds@gnu.org>
Date: Tue, 23 Dec 2014 18:24:30 +0000 (-0500)
Subject: fix bad merge
X-Git-Tag: emacs-25.0.90~2634^2~19^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9db3cdedae422ad8fe9012e16ac3510be15eb77c;p=emacs.git

fix bad merge
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7c459697a5..0b93d7673f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,30 @@
 	(shell): Pass it to `pop-to-buffer' instead of hard-coding
 	`pop-to-buffer-same-window'.
 
+2014-12-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/js.el (js--syntax-propertize-regexp-syntax-table): New var.
+	(js-syntax-propertize-regexp): Use it to recognize "slash in
+	a character class" (bug#19397).
+
+2014-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* completion.el: Use post-self-insert-hook (bug#19400).
+	(completion-separator-self-insert-command)
+	(completion-separator-self-insert-autofilling): Remove.
+	(completion-separator-chars): New var.
+	(completion-c-mode-hook, completion-setup-fortran-mode): Use it instead
+	of changing the keymap.
+	(completion--post-self-insert): New function.
+	(dynamic-completion-mode): Use it instead of rebinding keys.
+	(cmpl--completion-string): Rename from completion-string.
+	(add-completion-to-head, delete-completion): Let-bind it explicitly.
+
+2014-12-22  Bozhidar Batsov  <bozhidar@batsov.com>
+
+	* progmodes/ruby-mode.el (ruby--string-region): Simplify code
+	by leveraging `syntax-ppss'.
+
 2014-12-22  Artur Malabarba  <bruce.connor.am@gmail.com>
 
 	* let-alist.el (let-alist): Use `make-symbol' instead of `gensym'.