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

1 files changed, 9 insertions, 0 deletions

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index b7094479db2..e3e5613025d 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1208,6 +1208,7 @@ return value is @code{nil}.
 
 @node Time of Day
 @section Time of Day
+@cindex time of day
 
   This section explains how to determine the current time and time
 zone.
@@ -1320,6 +1321,7 @@ time zone.
 @node Time Conversion
 @section Time Conversion
 @cindex calendrical information
+@cindex time conversion
 
   These functions convert time values (@pxref{Time of Day}) into
 calendrical information and vice versa.
@@ -1415,6 +1417,9 @@ on others, years as early as 1901 do work.
 
 @node Time Parsing
 @section Parsing and Formatting Times
+@cindex time parsing
+@cindex time formatting
+@cindex formatting time values
 
   These functions convert time values to text in a string, and vice versa.
 Time values are lists of two to four integers (@pxref{Time of Day}).
@@ -1643,6 +1648,9 @@ interactively, it prints the duration in the echo area.
 
 @node Time Calculations
 @section Time Calculations
+@cindex time calculations
+@cindex comparing time values
+@cindex calendrical computations
 
   These functions perform calendrical computations using time values
 (@pxref{Time of Day}).
@@ -1823,6 +1831,7 @@ cause anything special to happen.
 
 @node Idle Timers
 @section Idle Timers
+@cindex idle timers
 
   Here is how to set up a timer that runs when Emacs is idle for a
 certain length of time.  Aside from how to set them up, idle timers