* lisp/progmodes/sh-script.el (sh-font-lock-paren): Don't burp at BOB.
* holidays.el (holiday-christian-holidays): Rename an entry (bug#12289)
(Not worth a :version bump.)
Extract "^[wW]arning" into a new var flymake-warning-re
Fix right and left key remapping issue (bug#12317)

* lisp/emulation/cua-rect.el (cua--init-rectangles):
* lisp/textmodes/picture.el (picture-mode-map):
* lisp/play/blackbox.el (blackbox-mode-map):
Remap right-char and left-char like forward-char and backward-char.
Auto-commit of loaddefs files.
* gtkutil.c: Add extern decl for Qxft.
New macro with-temp-buffer-window and related fixes.

* buffer.c (Fdelete_all_overlays): New function.

* window.el (temp-buffer-window-setup-hook)
(temp-buffer-window-show-hook): New hooks.
(temp-buffer-window-setup, temp-buffer-window-show)
(with-temp-buffer-window): New functions.
(fit-window-to-buffer): Remove unused optional argument
OVERRIDE.
(special-display-popup-frame): Make sure the window used shows
BUFFER.

* help.el (temp-buffer-resize-mode): Fix doc-string.
(resize-temp-buffer-window): New optional argument WINDOW.

* files.el (recover-file, save-buffers-kill-emacs):
* dired.el (dired-mark-pop-up): Use with-temp-buffer-window.
Fix minor problems found by static checking.

* buffer.c (Fdelete_all_overlays): Return nil.
* doc.c (Fsubstitute_command_keys):
* regex.c (WEAK_ALIAS):
* xdisp.c (redisplay_internal):
Move initialization down, to pacify GCC 4.7.1 -Wjump-misses-init.
Merge from gnulib.

This incorporates:
2012-08-29 stdbool: be more compatible with mixed C/C++ compiles
2011-11-30 manywarnings: update the list of "all" warnings
Auto-commit of generated files.
* configure.ac (WARN_CFLAGS): Omit -Wjump-misses-init.

It generates false alarms in doc.c, regex.c, xdisp.c.  See
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00040.html>.
Revert changes prompted only by gcc -Wjump-misses-init.
[Gnus] Silence XEmacs compilation warnings
* ruby-mode.el: Clean up keybindings.
(ruby-mode-map): Don't bind ruby-electric-brace,
ruby-beginning-of-defun, ruby-end-of-defun, ruby-mark-defun,
backward-kill-word, reindent-then-newline-and-indent.
(ruby-mark-defun): Remove.
(ruby-electric-brace): Remove.  Obsoleted by electric-indent-chars.
(ruby-mode): Set local beginning-of-defun-function and
end-of-defun-function values.
* progmodes/ruby-mode.el: Clean up keybindings (ChangeLog entry).
* configure.ac (_setjmp, _longjmp): Check by compiling

instead of by guessing.  The guesses were wrong for
recent versions of Solaris, such as Solaris 11.
Be more systematic about _setjmp vs setjmp.

* alloc.c (test_setjmp, mark_stack):
* image.c (PNG_LONGJMP) [PNG_LIBPNG_VER < 10500]:
(PNG_JMPBUF) [! (PNG_LIBPNG_VER < 10500)]:
(png_load, my_error_exit, jpeg_load):
* process.c (send_process_trap, send_process):
Uniformly prefer _setjmp and _longjmp to setjmp and longjmp.
The underscored versions are up to 30x faster on some hosts.
Formerly, the code used setjmp+longjmp sometimes and
_setjmp+_longjmp at other times, with no particular reason to
prefer setjmp+longjmp.
Auto-commit of generated files.
Have smtpmail.el prefer the From: header for the MAIL FROM envelope

* mail/smtpmail.el (smtpmail-send-it): Prefer the From: header
over `user-mail-address' for the SMTP MAIL FROM envelope.
(smtpmail-via-smtp): Ditto.
Fix display of Arabic diacriticals on Windows, per bug #11860.

 src/w32uniscribe.c (uniscribe_shape): Reverse the sign of
 offsets[j].dv, since the y axis of the screen coordinates points
 down, while the y axis of the font definition coordinates points
 up.  This fixes display of Arabic diacritics such as KASRA and
 KASRATAN.