mail/rmail.el (rmail-get-coding-system): Check rmail-get-coding-function before "funcall"ing it.
ChangeLog fixes
Fix previous ChangeLog fix
Merge from gnulib.

This incorporates:
2014-01-07 update from texinfo
2014-01-06 md5, sha1, sha256, sha512: support older autoconf
Fix handling of internal borders (Bug#16348).

* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Remove
internal border width from pixel width of windows.
(change_frame_size_1): Don't return early when frame's pixel
size changes - we still have to record the new sizes in the
frame structure.
* w32fns.c (x_set_tool_bar_lines): Clear internal border width
also when toolbar gets larger.
* window.c (check_frame_size): Include internal_border_width in
check.
* xdisp.c (Ftool_bar_height): Fix doc-string typo.
* xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): In
non-toolkit/non-GTK version clear internal border.
* xterm.c (x_clear_under_internal_border): New function for
non-toolkit/non-GTK version.
(x_after_update_window_line): In non-toolkit/non-GTK version
don't do that.
(handle_one_xevent, x_set_window_size): Call
x_clear_under_internal_border in non-toolkit/non-GTK version.
* xterm.h (x_clear_under_internal_border): Extern it.
Fix doc-string of frame_resize_pixelwise.

* frame.c (frame_resize_pixelwise): Fix doc-string.
src/xdisp.c (try_window_id): Update commentary.
Fix bug #16347 with updating redisplay of company-mode's "tooltip".

 src/xdisp.c (try_window_id): Don't use this function's optimizations
 if overlays in the buffer displayed by the window have changed
 since last redisplay.
 (message_dolog): Fix indentation.
merge trunk
mail/rmail.el (rmail-get-coding-system): Check rmail-get-coding-function before "funcall"ing it.
Fix minor build problems related to MinGW64.

 configure.ac: Read $srcdir/nt/mingw-cfg.site when $MSYSTEM is
 "MINGW64" as well.

 nt/inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64.

 src/unexw32.c (_start) [__MINGW64__]: Define to __start.
/etc cleanup: Removal of joke man pages and associated Lisp file.

	* etc/celibacy.1, etc/sex.6, etc/condom.1, etc/echo.msg:
	Deleted at RMS's suggestion. Not lost to posterity as they are
	part of the widely distributed funny-manpages collection.

	* lisp/play/meese.el: It's 2014 and Ed Meese is justly forgotten. Goes
	with removal of the joke manpages from /etc.
merge trunk
/etc cleanup

	* COOKIES, copying.paper, INTERVIEW, MAILINGLISTS, MOTIVATION,
	publicsuffix.txt SERVICE: More deletions suggested by RMS.
Fix MS-Windows build with MinGW runtime 4.x.

 nt/inc/sys/stat.h (_WSTAT_DEFINED): Define, to avoid compilation
 failures when wchar.h is included.
Restore erroneously deleted etc/publicsuffix.txt.
Fix last commit.
Restore erroneously deleted etc/publicsuffix.txt (again).
Restore and fix etc/ChangeLog entry.
Make the function emacs-repository-get-version polyvalent.

* version.el (emacs-repository-get-version): Enhance so the
function works correctly in either a Bazaar or Git repo. The
Bazaar case can be discarded  after the repo transition.