Merge from origin/emacs-24

e726f20 Handle "#" operator properly inside macro.  Fix coding bug.
618931b Handle dead frame in menu-bar-non-minibuffer-window-p.  (Bug#19728)
017a03a Document MS-Windows file-name idiosyncrasies  (Bug#19463)
f3faf4f Fix description of Customize buffer in Emacs manual.
1c1d0b7 Fix a typo in the Emacs manual's Hungry Delete description.
be7fb82 src/dispextern.h (FACE_FOR_CHAR): Fix the commentary.
33c4409 Spelling fixes
6c8231e python.el: Handle tabs in python-indent-dedent-line.
41c3b92 * lisp/progmodes/python.el: Respect user indentation after comment.
868df45 Avoid compiler warnings in decode_env_path.
b28c979 Fix XEmacs version typo in comment and ChangeLog
989fb32 Improve solution of bug #19701
6310530 Fix refilling of list of language environments in User Manual
c4c447d Restore XEmacs compatibility

Conflicts:
	doc/emacs/ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog

1 files changed, 13 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 7ba14964c0a..ff3042e8cbf 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,16 @@
+2015-02-26  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el
+        (python-indent-dedent-line-backspace-2)
+        (python-indent-dedent-line-backspace-3): New tests.
+
+2015-02-26  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * automated/python-tests.el (python-indent-pep8-1)
+        (python-indent-pep8-2, python-indent-pep8-3)
+        (python-indent-after-comment-2): Fix tests.
+        (python-indent-after-comment-3): New test.
+
 2015-02-24  Glenn Morris  <rgm@gnu.org>
 
         * automated/f90.el (f90-test-bug-19809): New test.