Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bd45c07c3ee3a5c908f524f6f42a1fbce67d805..121a395e63d2b7de25ef6402b15353562f41e072 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,38 @@
+2015-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * dired.el (dired-delete-file): Doc fix.  (Bug#20021)
+2015-03-06  Sergio Durigan Junior  <sergiodj@sergiodj.net>
+           Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+       * net/eudcb-bbdb.el (eudc-bbdb-field): New function.
+       (eudc-bbdb-filter-non-matching-record): Call eudc-bbdb-field.
+       (eudc-bbdb-format-record-as-result): Likewise.
+
+2015-03-08  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
+       `font-lock-constant-face' for nil, true and false.  Highlight
+       `self' as a keyword.  (Bug#17733)
+
+2015-03-08  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+       * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
+       beginning of regexp also after open brace or vertical bar.
+       (Bug#20026)
+
 2015-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * battery.el (battery-echo-area-format): Simplify default.
+       (battery-linux-sysfs): Standardize on energy&power.  Accept ADP1
+       for AC adapter.
+
        * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't try to
        unfold `closure's since byte-compile-unfold-lambda doesn't know how to
        do it.
 
 2015-03-06  Oscar Fuentes  <ofv@wanadoo.es>
 
-       * net/browse-url.el (browse-url-firefox): Removed outdated
+       * net/browse-url.el (browse-url-firefox): Remove outdated
        MS-Windows limitations.
 
 2015-03-06  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
@@ -16,8 +42,8 @@
        (eudc-ldap-cleanup-record-filtering-addresses): Add docstring.
        Don't clean up postal addresses if ldap-ignore-attribute-codings
        is set.  Combine mail addresses into one field. (Bug#17720)
-       (eudc-ldap-simple-query-internal): Call
-       eudc-ldap-cleanup-record-filtering-addresses instead of
+       (eudc-ldap-simple-query-internal):
+       Call eudc-ldap-cleanup-record-filtering-addresses instead of
        eudc-ldap-cleanup-record-simple.
        (eudc-ldap-get-field-list): Likewise.
 
@@ -215,8 +241,8 @@
 2015-03-03  Agustín Martín Domingo  <agustin6martin@gmail.com>
 
        Improve string search in `flyspell-word-search-*`. (Bug#16800)
-       * flyspell.el (flyspell-duplicate-distance): Limit default search
-       distance for duplicated words to 40000.
+       * textmodes/flyspell.el (flyspell-duplicate-distance): Limit
+       default search distance for duplicated words to 40000.
        (flyspell-word-search-backward, flyspell-word-search-forward):
        Search as full word with defined casechars, not as substring.