merge trunk
lisp/subr.el (read-quoted-char): Remove unused local variable `char'.
ChangeLog fixes.
Port to Ubuntu 10.

Problem reported by T.V. Raman.
* configure.ac (accept4): New function to check for.
* src/process.c (close_on_exec, accept4, process_socket):
Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC.
Remove stray empty line.
merge trunk
Try to fix FreeBSD 9.1 porting problem.

This incorporates the following merge from gnulib:
2013-07-07 stdalign, verify: port to FreeBSD 9.1, to C11, and to C++11
Auto-commit of generated files.
* net/shr.el (shr-map): Reinstate the `u' key binding

It's been used a while.
decoder-tests.el (decoder-tests-prefer-utf-8-read):
Use with-ccoding-priority to avoid side-effect (Bug#14781).
*** empty log message ***
merge trunk
automated/decoder-tests.el (decoder-tests-prefer-utf-8-read): Use with-coding-priority to avoid side-effect (Bug#14781).
configure.ac (HAVE_IMAGEMAGICK): Check on NS also.
image.c (imagemagick_load_image): Do not use MagickExportImagePixels
on NS even if it is present.  Pixmap on NS is a void*.
Improve scrolling when line-spacing is non-nil.

 lisp/simple.el (line-move-partial, line-move): Account for
 line-spacing.
Fix lisp/ChangeLog entry for last commit.
* NEWS: NS can be build with ImageMagick.
Fixes: debbugs:14826

* progmodes/sh-script.el (sh-read-variable): Remove interactive
spec.
* lisp/emacs-lisp/pcase.el (pcase--split-pred): Add `vars' argument to try
and detect when a guard/pred depends on local vars.
(pcase--u1): Adjust caller.
* lisp/faces.el (tty-setup-hook): Declare the hook.