merge emacs-23
quail/indian.el (indian-tlg-base-table): Fix typo; dev -> tlg.
quail/indian.el (indian-tlg-base-table): Fix typo; dev -> tlg.
src/xdisp.c: Fix commentary of display_count_lines.
* doc/misc/eshell.texi: Fill most of the missing sections.
* doc/misc/eshell.texi: Fill most of the missing sections.
keymaps.texi tweak

* doc/lispref/keymaps.texi (Active Keymaps, Searching Keymaps):
Remove confusing mention of "symbolic prefix".
Remove longlines entry (bug#13652)
Remove old TODO item - user-error was added
More small TODO updates
* doc/lispref/keymaps.texi (Creating Keymaps): Update make-keymap result.
Correct non-standard binding of report-emacs-bug-insert-to-mailer.

* lisp/mail/emacsbug.el (report-emacs-bug): Change binding of
report-emacs-bug-insert-to-mailer to C-c M-i.
lisp/gnus/nnir.el ("nnir"): Add 'virtual ability to nnir backend
ChangeLog typo fix
* doc/emacs/trouble.texi (Checklist): Update bug keybinding.
* net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,
if DIR exists and PARENTS is non-nil.
* doc/lispref/keymaps.texi (Key Binding Commands): Trivial rephrasing.
* doc/lispref/objects.texi (Char-Table Type): Add cindex.
NEWS copyedit (consistent capitalization for top-level headings)
Fix rare aborts in bidi.c.

 src/bidi.c (bidi_resolve_neutral): After finding the next
 non-neutral character, accept NEUTRAL_ON type as well, because
 directional control characters, such as LRE and RLE, have their
 type converted to that by bidi_resolve_weak.  This avoids aborts
 when LRE/RLE follows a run of neutrals.
 (bidi_move_to_visually_next): Assert that return value of
 bidi_peek_at_next_level is non-negative.  Negative values will
 cause an infloop.