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

5 files changed, 73 insertions, 38 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).
diff --git a/src/emacs.c b/src/emacs.c
index da34eaac14b..b9654d0e03c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -88,9 +88,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sysselect.h"
 #include "systime.h"
 
-#ifdef HAVE_GNUTLS
 #include "gnutls.h"
-#endif
 
 #if (defined PROFILING \
      && (defined __FreeBSD__ || defined GNU_LINUX || defined __MINGW32__))
@@ -1493,9 +1491,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       syms_of_fontset ();
 #endif /* HAVE_NS */
 
-#ifdef HAVE_GNUTLS
       syms_of_gnutls ();
-#endif
 
 #ifdef HAVE_GFILENOTIFY
       syms_of_gfilenotify ();
diff --git a/src/gnutls.c b/src/gnutls.c
index 4de2eaf5b52..4e12d88ab82 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -779,26 +779,6 @@ See also `gnutls-init'.  */)
   return emacs_gnutls_deinit (proc);
 }
 
-DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
-       doc: /* Return t if GnuTLS is available in this instance of Emacs.  */)
-     (void)
-{
-#ifdef WINDOWSNT
-  Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache);
-  if (CONSP (found))
-    return XCDR (found);
-  else
-    {
-      Lisp_Object status;
-      status = init_gnutls_functions () ? Qt : Qnil;
-      Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache);
-      return status;
-    }
-#else
-  return Qt;
-#endif
-}
-
 static Lisp_Object
 gnutls_hex_string (unsigned char *buf, ptrdiff_t buf_size, const char *prefix)
 {
@@ -1101,7 +1081,6 @@ The return value is a property list with top-level keys :warnings and
   return result;
 }
 
-
 /* Initialize global GnuTLS state to defaults.
    Call `gnutls-global-deinit' when GnuTLS usage is no longer needed.
    Return zero on success.  */
@@ -1602,9 +1581,36 @@ This function may also return `gnutls-e-again', or
   return gnutls_make_error (ret);
 }
 
+#endif  /* HAVE_GNUTLS */
+
+DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
+       doc: /* Return t if GnuTLS is available in this instance of Emacs.  */)
+     (void)
+{
+#ifdef HAVE_GNUTLS
+# ifdef WINDOWSNT
+  Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache);
+  if (CONSP (found))
+    return XCDR (found);
+  else
+    {
+      Lisp_Object status;
+      status = init_gnutls_functions () ? Qt : Qnil;
+      Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache);
+      return status;
+    }
+# else  /* !WINDOWSNT */
+  return Qt;
+# endif  /* !WINDOWSNT */
+#else  /* !HAVE_GNUTLS */
+  return Qnil;
+#endif  /* !HAVE_GNUTLS */
+}
+
 void
 syms_of_gnutls (void)
 {
+#ifdef HAVE_GNUTLS
   gnutls_global_initialized = 0;
 
   DEFSYM (Qgnutls_dll, "gnutls");
@@ -1646,7 +1652,6 @@ syms_of_gnutls (void)
   defsubr (&Sgnutls_boot);
   defsubr (&Sgnutls_deinit);
   defsubr (&Sgnutls_bye);
-  defsubr (&Sgnutls_available_p);
   defsubr (&Sgnutls_peer_status);
   defsubr (&Sgnutls_peer_status_warning_describe);
 
@@ -1656,6 +1661,8 @@ Set this larger than 0 to get debug output in the *Messages* buffer.
 1 is for important messages, 2 is for debug data, and higher numbers
 are as per the GnuTLS logging conventions.  */);
   global_gnutls_log_level = 0;
-}
 
-#endif /* HAVE_GNUTLS */
+#endif  /* HAVE_GNUTLS */
+
+  defsubr (&Sgnutls_available_p);
+}
diff --git a/src/gnutls.h b/src/gnutls.h
index 8a667c00568..8a18976cf1b 100644
--- a/src/gnutls.h
+++ b/src/gnutls.h
@@ -82,8 +82,8 @@ extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err);
 #endif
 extern Lisp_Object emacs_gnutls_deinit (Lisp_Object);
 
-extern void syms_of_gnutls (void);
-
 #endif
 
+extern void syms_of_gnutls (void);
+
 #endif
diff --git a/src/xdisp.c b/src/xdisp.c
index 0d314688c26..f022790023b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8794,12 +8794,7 @@ move_it_in_display_line_to (struct it *it,
                          doesn't fit on the line, e.g. a wide image.  */
                       it->hpos == 0
                       || (new_x == it->last_visible_x
-                          && FRAME_WINDOW_P (it->f)
-                          /* When word-wrap is ON and we have a valid
-                             wrap point, we don't allow the last glyph
-                             to "just barely fit" on the line.  */
-                          && (it->line_wrap != WORD_WRAP
-                              || wrap_it.sp < 0)))
+                          && FRAME_WINDOW_P (it->f)))
                     {
                       ++it->hpos;
                       it->current_x = new_x;
@@ -8866,7 +8861,8 @@ move_it_in_display_line_to (struct it *it,
                                 }
                               if (ITERATOR_AT_END_OF_LINE_P (it)
                                   && (it->line_wrap != WORD_WRAP
-                                      || wrap_it.sp < 0))
+                                      || wrap_it.sp < 0
+                                      || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)))
                                 {
                                   result = MOVE_NEWLINE_OR_CR;
                                   break;
@@ -20438,7 +20434,8 @@ display_line (struct it *it)
                         {
                           /* If line-wrap is on, check if a previous
                              wrap point was found.  */
-                          if (wrap_row_used > 0
+                          if (!IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)
+                              && wrap_row_used > 0
                               /* Even if there is a previous wrap
                                  point, continue the line here as
                                  usual, if (i) the previous character
@@ -20468,6 +20465,18 @@ display_line (struct it *it)
                                   row->continued_p = 0;
                                   row->exact_window_width_line_p = 1;
                                 }
+                              /* If line-wrap is on, check if a
+                                 previous wrap point was found.  */
+                              else if (wrap_row_used > 0
+                                       /* Even if there is a previous wrap
+                                          point, continue the line here as
+                                          usual, if (i) the previous character
+                                          was a space or tab AND (ii) the
+                                          current character is not.  */
+                                       && (!may_wrap
+                                           || IT_DISPLAYING_WHITESPACE (it)))
+                                goto back_to_wrap;
+
                             }
                         }
                       else if (it->bidi_p)