emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 9db3cde: fix bad merge


From: Sam Steingold
Subject: [Emacs-diffs] master 9db3cde: fix bad merge
Date: Tue, 23 Dec 2014 18:24:39 +0000

branch: master
commit 9db3cdedae422ad8fe9012e16ac3510be15eb77c
Author: Sam Steingold <address@hidden>
Commit: Sam Steingold <address@hidden>

    fix bad merge
---
 lisp/ChangeLog |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7c4596..0b93d76 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  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby--string-region): Simplify code
+       by leveraging `syntax-ppss'.
+
 2014-12-22  Artur Malabarba  <address@hidden>
 
        * let-alist.el (let-alist): Use `make-symbol' instead of `gensym'.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]