Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 596b6e2ccb5f6e8437e50922564a48182eaf597a..248f24d64909e437fded0c6dfd6e0655b6b6b662 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2015-03-23  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/authors.el (authors-aliases)
+       (authors-obsolete-files-regexps): Additions.
+
+2015-03-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * simple.el (deactivate-mark): Only modify PRIMARY if we own
+       PRIMARY (Bug#18939).
+
+2015-03-23  Martin Rudalics  <rudalics@gmx.at>
+
+       * emacs-lisp/debug.el (debug): Don't try using "previous" window
+       when its not live or on an invisible frame (Bug#17170).
+
+2015-03-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * json.el (json-decode-char0): Delete this alias as well.
+       (json-read-escaped-char): Don't call it (bug#20154).
+
+2015-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs-lisp/lisp-mode.el (lisp--el-non-funcall-position-p): New function.
+       (lisp--el-match-keyword): Use it.
+
+2015-03-23  Daiki Ueno  <ueno@gnu.org>
+
+       * subr.el (start-process): New function, ported from the C
+       implementation.
+
 2015-03-23  Daniel Colascione  <dancol@dancol.org>
 
        Automatically adjust process window sizes.
@@ -23,7 +53,7 @@
 
 2015-03-22  Dmitry Gutov  <dgutov@yandex.ru>
 
-       * json.el (json-decode-char0): Delete this alias.
+       * json.el (json-encode-char0): Delete this alias.
        (json-encode-string): Rewrite to improve performance (bug#20154).
        (json-encode-char): Fold into `json-encode-string'.