Addendum to: Undo in region after markers in undo history relocated

* simple.el (primitive-undo): Correction to 2014-03-24 change.
* insdel.c (adjust_markers_for_delete): Remove unused local.
Merge from gnulib.

This incorporates:
2014-03-26 strftime: wrap macros in "do {...} while(0)"
* lib/strftime.c, doc/misc/texinfo.tex: Update from gnulib.
Fix core dump in char-equal.

* editfns.c (Fchar_equal): Do not use MAKE_CHAR_MULTIBYTE in
unibyte buffers, as we can't tell whether the characters are
actually unibyte.
Fix wrong timestamp.
* lisp/emacs-lisp/package.el: Fix bug#16733 (again).
  (url-http-parse-response, url-http-end-of-headers, url-recreate-url)
  (url-http-target-url): Remove unused declarations.
  (package-handle-response): Remove.
  (package--with-work-buffer): Use url-insert-file-contents and simplify.
  (package--download-one-archive): Use current-buffer instead of
  dynamic binding of `buffer'.
  (describe-package-1): Do not decode readme-string.

* lisp/url/url-handlers.el (url-http-parse-response): Add autoload.
  (url-insert-file-contents): Signal file-error in case of HTTP error.
More backward-compatible fix to char-equal core dump.

* editfns.c (Fchar_equal): In unibyte buffers, assume values in
range 128-255 are raw bytes.  Suggested by Eli Zaretskii.
lisp/emacs-lisp/package-x.el: Follow-up to change in package.el.

(package--archive-contents-from-url): Use url-insert-file-contents;
package-handle-response no longer exists.
lisp/frameset.el: Fix bug#17046.

(frameset--restore-frame): Remove workaround for bug#14795
which is no longer needed and causes trouble in GTK builds.
Fix bug#17097

* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function):
Don't propertize `?' or `!' as symbol constituent when after
colon.
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
special globals with font-lock-builtin-face.
Fix bug #17115 with displaying on w32 images that have 'box' face.

 src/w32term.c (x_draw_image_glyph_string): Fix computation of height
 and width of image background when it is displayed with a 'box'
 face.
Adjust image background width on X11 accordingly when its x position is adjusted. (Bug#17115)
Backport NEWS tweak from trunk
* src/conf_post.h (SYSTEM_PURESIZE_EXTRA) [CYGWIN]: Set to 10000.  (Bug#17112)
* etc/CONTRIBUTE: Small updates
* etc/CONTRIBUTE: Avoid being specific about countries.
It's just liable to get outdated.