Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9448e0514e60ff1c9c20ea29881836157cc46269..248f24d64909e437fded0c6dfd6e0655b6b6b662 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+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.