* emacs.c (main): Skip -psn args on OSX even if ! isatty (0).
* automated/ert-tests.el (ert-test-stats-set-test-and-result):
Add a skipping test.
* configure.ac: Use [!...] rather than [^...], for ksh.  (Bug#15769)
* lisp/progmodes/ruby-mode.el (ruby-indent-tabs-mode)
(ruby-indent-level, ruby-comment-column, ruby-deep-arglist):
Add property :safe.
(ruby-deep-arglist): Add property :type.
Support newer versions of libjpeg on MS-Windows.

 src/image.c (Qlibjpeg_version): New variable.
 (syms_of_image): DEFSYM and initialize it.

 lisp/term/w32-win.el (dynamic-library-alist): Support newer versions
 of libjpeg starting with v7: look only for the DLL from the
 version against which Emacs was built.
Support libpng DLLs of versions beyond 1.4.x on MS-Windows.

 lisp/term/w32-win.el (dynamic-library-alist): Support versions of
 libpng beyond 1.4.x.
lisp/term/w32-win.el (dynamic-library-alist): Support libtiff v4.x on w32.
Fix handling of comments in NetPBM image files.

 src/image.c (pbm_next_char): New function.
 (pbm_scan_number): Use it.

 lisp/image.el (image-type-header-regexps): Fix the 'pbm' part to
 allow comments in pbm files.
Fix ChangeLog entry of last commit.
Fix whitespace in src/casefiddle.c.
Auto-commit of generated files.
Auto-commit of loaddefs files.
Allow multiple bibliographies when BibLaTeX is used rathen than
BibTeX.
* textmodes/reftex-parse.el (reftex-using-biblatex-p): New function.
(reftex-locate-bibliography-files): Us it.
Add :distant-foreground to faces.

* doc/lispref/display.texi (Face Attributes): Document :distant-foreground.

* etc/NEWS: Mention :distant-foreground.

* lisp/faces.el (face-x-resources): Add :distant-foreground.
(region): Use :distant-foreground for gtk and ns.

* src/dispextern.h (lface_attribute_index): Add
LFACE_DISTANT_FOREGROUND_INDEX.

* src/xfaces.c: Declare color_distance.
(QCdistant_foreground): New variable.
(NEAR_SAME_COLOR_THRESHOLD): New define.
(load_color2): New function.
(load_color): Call load_color2.
(load_face_colors): Call load_color2 and if distant-color is specified
calculate distant and use distant-color if colors are near.
(LFACE_DISTANT_FOREGROUND): New define.
(merge_face_ref, Finternal_set_lisp_face_attribute)
(Finternal_get_lisp_face_attribute)
(x_supports_face_attributes_p): Handle distant-foreground similar to
foreground.
(syms_of_xfaces): DEFSYM QCdistant_foreground.
* lisp/Makefile.in: Remove manual mh-e dependencies
(writing .elc files is atomic for some time,
so no parallel compilation issues)
* lisp/progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax
table and abbrev table, `define-derived-mode' does that for us
anyway.
* lisp/progmodes/ruby-mode.el (ruby-mode-variables, ruby-mode): Use `setq-local'.
* lisp/progmodes/ruby-mode.el Use `syntax-propertize-function'
unconditionally.  Remove now unnecessary forward declarations.
Remove XEmacs-specific setup.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords)
(ruby-comment-beg-syntax, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Remove.
(ruby-mode): Don't check whether `syntax-propertize-rules' is
defined as function.
* emacs.c (original_pwd): Remove global var by making it local.

(init_cmdargs): New arg ORIGINAL_PWD; caller changed.
* lisp/progmodes/ruby-mode.el (ruby-smie--rule-parent-skip-assign): New
function, replacement for `smie-rule-parent' for when we want to
skip over our direct parent if it's an assignment token..
(ruby-smie-rules): Use it.