Merge from origin/emacs-24

bd6c441 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens.
16d4c1c A better fix for bug#19346
82ec808 * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files.
3cf7629 Git ignore lib/std*.h
301a401 Always define `gnutls-available-p' even if GnuTLS is not available.
d76b9b2 Don't break example string between 2 lines (bug#19257)
75b4857 Port commit-msg to mawk
9ac0332 Improve commit-msg messages and autosquash
0c2f254 Support overflow-newline-into-fringe together with word-wrap (bug#19300)
935ee05 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'.
c2db939 python.el: Support interpreter paths with spaces
d83f329 ChangeLog fix
0f9fbb9 Port commit-message checking to FreeBSD 9.
3db1ada admin/MAINTAINERS: Update my interests and responsibilities.
6382f24 * .gitignore: Ignore autosave files.

Conflicts:
	ChangeLog
	lisp/progmodes/python.el
	src/gnutls.c

1 files changed, 23 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 887ca89261a..fd37eaefbec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2014-12-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move
+        gnutls-available-p out of the HAVE_GNUTLS conditional, and define
+        them only once.
+
+2014-12-11  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * emacs.c (main): Always include gnutls.h and run syms_of_gnutls.
+
+        * gnutls.h: Always declare syms_of_gnutls.
+
+        * gnutls.c (Fgnutls_available_p syms_of_gnutls): Move later for
+        clarity.  Let the availability check return Qnil when the GnuTLS
+        integration is not available, instead of erroring out.
+        (Bug#19346)
+
+2014-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_in_display_line_to, display_line): Don't
+        disallow overflow-newline-into-fringe when word-wrap is in
+        effect.  (Bug#19300)
+
 2014-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * fileio.c: Better preserve window-points during revert (bug#19161).