Fabián Ezequiel Gallina 411c1c6531 Merge from origin/emacs-24 ... 216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust. 20cfd24 Improve indexing on the chapter/section/subsection levels. 14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided. ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows. 012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function 75e114f Fix line numbers on Python shell. d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing. 8e818d1 Keep maximized when going fullscreen. 749813e python.el: Fix electric colon behavior 936d5e5 Fix last patch. 74d3b20 Fixes: debbugs:18623 Conflicts: doc/emacs/ChangeLog doc/lispref/ChangeLog doc/lispref/functions.texi lisp/ChangeLog src/ChangeLog src/xterm.c test/ChangeLog		2014-12-27 13:21:17 -03:00
..
emacs	Merge from origin/emacs-24	2014-12-27 13:21:17 -03:00
lispintro	Merge branch 'emacs-24'.	2014-11-28 23:07:16 -08:00
lispref	Merge from origin/emacs-24	2014-12-27 13:21:17 -03:00
man	Remove lib-src/grep-changelog	2014-12-13 18:38:21 -08:00
misc	ChangeLog fixes	2014-12-24 15:19:25 -08:00