Paul Eggert d8e9122115 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		2015-02-25 22:53:56 -08:00
..
emacs	Merge from origin/emacs-24	2015-02-25 22:53:56 -08:00
lispintro	Fix copyright years by hand	2015-01-01 14:27:34 -08:00
lispref	Improve seq-group-by to return sequence elements in correct order	2015-02-11 14:45:51 +01:00
man	Merge from gnulib and try to repair bad merge	2015-01-27 22:24:47 -08:00
misc	Handle customizations of reftex-include-file-commands	2015-02-25 11:45:20 +01:00