* lisp/shell.el (shell-parse-pcomplete-arguments):
Obey pcomplete-arg-quote-list inside double-quoted args as well.
* mail/smtpmail.el (smtpmail-send-command): Send the command and
the following \r\n using a single `process-send-string', since the
Lotus SMTP server refuses to accept any commands if they are sent
with two `process-send-string's.
* unexaix.c (make_hdr): Fix typo in prototype.

This bug broke the build on AIX.  Problem reported by Gilles Pion.
* net/rlogin.el (rlogin-mode-map): Fix last change.
Fix display when left-fringe/right-fringe display spec is invalid.

 src/xdisp.c (handle_single_display_spec): Return 1 for left-margin
 and right-margin display specs even if the spec is invalid or we
 are on a TTY, and thus unable to display on the fringes.  That's
 because the text with the property will not be displayed anyway,
 so we need to signal to the caller that this is a "replacing"
 display spec.  This fixes display when the spec is invalid or we
 are on a TTY.
* Makefile.in (gnus.dvi): Use $@ instead of $*.dvi.
* cc-mode.texi: Avoid space before macro in 4th argument of cross
reference commands.
Backport fix for Bug#11382 from trunk
Backport fix for Bug#11382 from trunk
Fix bug #11417 with infloop when left-fringe/right-fringe spec is used on TTY.

 src/xdisp.c (handle_stop): Don't call get_overlay_strings_1 if we
 already have overlays loaded.
 (handle_single_display_spec): Before returning without displaying
 fringe bitmap, synchronize the bidi iterator with the main display
 iterator, by calling iterate_out_of_display_property.
 (iterate_out_of_display_property): Detect buffer iteration by
 testing that it->string is a Lisp string.
 (get_next_display_element): When the current object is exhausted,
 and there's something on it->stack, call set_iterator_to_next to
 proceed with what's on the stack, instead of returning zero.
 (set_iterator_to_next): If called at the end of a Lisp string,
 proceed to consider_string_end without incrementing string
 position.  Don't increment display vector index past the end of
 the display vector.
Fix bug #11464 with pos-visible-in-window-p and R2L text in L2R paragraph.

 src/xdisp.c (pos_visible_p): Don't report a position visible when move_it_to
 stopped at the last line of window, which happens to be scanned
 backwards by the bidi iteration.
(rst-re-alist): Fix loading (bug#11462).
Merge from emacs-24; up to r107994
Merge from emacs-24; up to r107994
* unexaix.c: Port to more-recent AIX compilers.

(report_error, report_error_1, make_hdr, copy_sym)
(mark_x, adjust_lnnoptrs, unrelocate_symbols):
Make arguments const char *, not char *, to avoid violations of C
standard and to fix some AIX warnings reported by Gilles Pion.
* keyboard.c (kbd_buffer_get_event) [!HAVE_DBUS]: Omit unused local.
Fix a regression in erc-dcc

* erc-dcc.el (erc-dcc-handle-ctcp-send): Fix a regression
introduced on 2011-11-28 when fixing quoted filenames matching,
the regex group was not corrected.
ChangeLog merge fixes
* src/nsterm.m (ns_init_paths): Fix typo ("libexec" not "lib-exec").
Make a self-contained ns build able to find its own libexec directory

Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00298.html

* src/nsterm.m (ns_init_paths):
Put "libexec" before "bin", for the sake of init_callproc_1.