• Fabián Ezequiel Gallina's avatar
    Merge from origin/emacs-24 · 411c1c65
    Fabián Ezequiel Gallina authored
    216c6aad * 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.
    20cfd248 Improve indexing on the chapter/section/subsection levels.
    14c37390 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
    ea78112b * 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.
    012479a7 * lisp/progmodes/sh-script.el: Don't set global indent-line-function
    75e114fa Fix line numbers on Python shell.
    d0fd23c5 doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
    8e818d17 Keep maximized when going fullscreen.
    749813e9 python.el: Fix electric colon behavior
    936d5e5b Fix last patch.
    74d3b20c Fixes: debbugs:18623
    
    Conflicts:
    	doc/emacs/ChangeLog
    	doc/lispref/ChangeLog
    	doc/lispref/functions.texi
    	lisp/ChangeLog
    	src/ChangeLog
    	src/xterm.c
    	test/ChangeLog
    411c1c65
display.texi 279 KB