Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 816a8cb6b43de0b49af01846dd4765113480608e..73228900df02466e10c0f1957604cd3ee6469321 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix dired quoting bug with "Hit`N`Hide"
+       Fixes Bug#19498.
+       * files.el (shell-quote-wildcard-pattern): Also quote "`".
+
 2015-01-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * emacs-lisp/cl.el (cl--function-convert):