Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 447-459)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 141-144)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115

19 files changed, 391 insertions, 71 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b22c5d5dc0..79bfe7fe4eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,121 @@
+2006-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (handle_fontified_prop): Don't fontify at EOB.
+
+2006-09-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * config.in Regenerated.
+
+2006-09-29  Juri Linkov  <juri@jurta.org>
+
+        * buffer.c (syms_of_buffer): Reorder coding systems in the
+        docstring of %z to the real order displayed in the modeline.
+
+2006-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fdefine_key): Yet another int/Lisp_Object mixup (YAILOM).
+
+2006-09-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * indent.c (Fvertical_motion): Do move back if the Lisp string
+        being displayed contains newlines.
+
+2006-09-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (mac_compute_glyph_string_overhangs, XLoadQueryFont)
+        [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw before QDTextBounds.
+
+2006-09-26  Kenichi Handa  <handa@m17n.org>
+
+        * keymap.c (Fsingle_key_description): For an invalid char, return
+        "Invalid char code NNNNN".
+
+2006-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * callint.c (Fcall_interactively): Doc fix.
+
+2006-09-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_underline_at_descent_line): New variable.
+        (syms_of_macterm): DEFVAR_BOOL it.
+        (x_draw_glyph_string): Use it.
+        (XLoadQueryFont): Calculate min_bounds.descent and max_bounds.descent.
+
+2006-09-25  Kenichi Handa  <handa@m17n.org>
+
+        * keymap.c (Fsingle_key_description): Return unique names for
+        generic characters.
+
+2006-09-24  Richard Stallman  <rms@gnu.org>
+
+        * search.c (compile_pattern_1): Don't BLOCK_INPUT.
+
+2006-09-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/fns.$(O), $(BLD)/w32proc.$(O)): Depend
+        on nt/inc/langinfo.h and nt/inc/nl_types.h.
+
+        * w32proc.c (nl_langinfo): New function.
+
+        * w32fns.c (w32-pass-alt-to-system, w32-alt-is-meta)
+        (w32-pass-lwindow-to-system, w32-enable-num-lock)
+        (w32-enable-caps-lock, w32-scroll-lock-modifier)
+        (w32-lwindow-modifier, w32-rwindow-modifier)
+        (w32-apps-modifier, w32-mouse-button-tolerance): Doc fix.
+
+2006-09-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.c (Finternal_complete_buffer, Fread_minibuffer)
+        (Fdisplay_completion_list): Fix typos in docstrings.
+
+2006-09-23  Romain Francoise  <romain@orebokech.com>
+
+        * s/gnu-linux.h (MAIL_USE_FLOCK): Check for HAVE_LIBLOCKFILE too.
+
+2006-09-23  Kenichi Handa  <handa@m17n.org>
+
+        * keymap.c (Fmap_keymap): Docstring mentions about generic character.
+
+2006-09-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * regex.c (analyse_first): For eight-bit-control chars, mark both the
+        char's value and its leading byte in the fastmap.
+        (re_search_2): When fast-scanning without translation, be careful to
+        check that we only match the leading byte of a multibyte char.
+
+        * charset.h (PREV_CHAR_BOUNDARY): Make it work from within a char's
+        byte sequence.
+        (AT_CHAR_BOUNDARY): New macro.
+
+2006-09-22  Kenichi Handa  <handa@m17n.org>
+
+        * fns.c (optimize_sub_char_table): Don't optimize a sub-char-table
+        whose default value is non-nil.
+
+2006-09-22  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_get_file_with_chooser): Only show C-l help for
+        Gtk+ versions < 2.10.
+
+        * xfns.c (syms_of_xfns): Fix typo in help text for
+        x-gtk-file-dialog-help-text.
+
+2006-09-21  Kim F. Storm  <storm@cua.dk>
+
+        * fns.c (Fmemq): Refill doc string.
+        (Fmemql): New defun, like memq but using eql.
+        (syms_of_fns): Defsubr it.
+
+2006-09-20  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (pos_visible_p): CHARPOS < 0 means return info for
+        last visible glyph in window.
+
+        * window.c (Fset_window_hscroll, Fwindow_line_height):
+        Doc fix.  Use "off-window" instead of "off-screen".
+        (Fpos_visible_in_window_p): Likewise.
+        If POS is t, return info for last visible glyph in window.
+
 2006-09-19  Chong Yidong  <cyd@stupidchicken.com>
 
         * search.c (struct regexp_cache): New entry syntax_table.
@@ -242,7 +360,7 @@
 
 2006-08-27  Martin Rudalics  <rudalics@gmx.at>
 
-        * xdisp.c (mouse_autoselect_window): Removed.
+        * xdisp.c (mouse_autoselect_window): Remove.
         (Vmouse_autoselect_window): New variable.  DEFVAR_LISP it.
 
         * dispextern.h (mouse_autoselect_window): Remove extern.
diff --git a/src/buffer.c b/src/buffer.c
index 5369fe0fac1..47877b6a37b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5507,7 +5507,7 @@ A string is printed verbatim in the mode line except for %-constructs:
         or print Bottom or All.
   %n -- print Narrow if appropriate.
   %t -- visited file is text or binary (if OS supports this distinction).
-  %z -- print mnemonics of buffer, terminal, and keyboard coding systems.
+  %z -- print mnemonics of keyboard, terminal, and buffer coding systems.
   %Z -- like %z, but including the end-of-line format.
   %e -- print error message about full memory.
   %[ -- print one [ for each recursive editing level.  %] similar.
diff --git a/src/callint.c b/src/callint.c
index 4c8a5718cd9..392b6f00eec 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -257,9 +257,11 @@ See `interactive'.
 Optional second arg RECORD-FLAG non-nil
 means unconditionally put this command in the command-history.
 Otherwise, this is done only if an arg is read using the minibuffer.
+
 Optional third arg KEYS, if given, specifies the sequence of events to
-supply if the command inquires which events were used to invoke it.
-If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
+supply, as a vector, if the command inquires which events were used to
+invoke it.  If KEYS is omitted or nil, the return value of
+`this-command-keys-vector' is used.  */)
      (function, record_flag, keys)
      Lisp_Object function, record_flag, keys;
 {
diff --git a/src/config.in b/src/config.in
index 44a56e36dd3..106aeea920c 100644
--- a/src/config.in
+++ b/src/config.in
@@ -124,10 +124,6 @@ Boston, MA 02110-1301, USA.  */
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
 
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-   */
-#undef HAVE_DECL_TZNAME
-
 /* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL___SYS_SIGLIST
@@ -809,7 +805,7 @@ Boston, MA 02110-1301, USA.  */
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
+   automatically deduced at run-time.
         STACK_DIRECTION > 0 => grows toward higher addresses
         STACK_DIRECTION < 0 => grows toward lower addresses
         STACK_DIRECTION = 0 => direction of growth unknown */
diff --git a/src/fns.c b/src/fns.c
index 044f82fcdb6..e77d8cbca7e 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1383,11 +1383,10 @@ The value is actually the tail of LIST whose car is ELT.  */)
 }
 
 DEFUN ("memq", Fmemq, Smemq, 2, 2, 0,
-       doc: /* Return non-nil if ELT is an element of LIST.
-Comparison done with `eq'.  The value is actually the tail of LIST
-whose car is ELT.  */)
+doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eq'.
+The value is actually the tail of LIST whose car is ELT.  */)
      (elt, list)
-     Lisp_Object elt, list;
+     register Lisp_Object elt, list;
 {
   while (1)
     {
@@ -1410,6 +1409,30 @@ whose car is ELT.  */)
   return list;
 }
 
+DEFUN ("memql", Fmemql, Smemql, 2, 2, 0,
+doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eql'.
+The value is actually the tail of LIST whose car is ELT.  */)
+     (elt, list)
+     register Lisp_Object elt;
+     Lisp_Object list;
+{
+  register Lisp_Object tail;
+
+  if (!FLOATP (elt))
+    return Fmemq (elt, list);
+
+  for (tail = list; !NILP (tail); tail = XCDR (tail))
+    {
+      register Lisp_Object tem;
+      CHECK_LIST_CONS (tail, list);
+      tem = XCAR (tail);
+      if (FLOATP (tem) && internal_equal (elt, tem, 0, 0))
+        return tail;
+      QUIT;
+    }
+  return Qnil;
+}
+
 DEFUN ("assq", Fassq, Sassq, 2, 2, 0,
        doc: /* Return non-nil if KEY is `eq' to the car of an element of LIST.
 The value is actually the first element of LIST whose car is KEY.
@@ -5207,6 +5230,7 @@ used if both `use-dialog-box' and this variable are non-nil.  */);
   defsubr (&Selt);
   defsubr (&Smember);
   defsubr (&Smemq);
+  defsubr (&Smemql);
   defsubr (&Sassq);
   defsubr (&Sassoc);
   defsubr (&Srassq);
diff --git a/src/gtkutil.c b/src/gtkutil.c
index cdc87044c81..fb3c9447f84 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1382,7 +1382,9 @@ xg_get_file_with_chooser (f, prompt, default_filename,
   if (x_gtk_file_dialog_help_text)
     {
       message[0] = '\0';
-      if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
+      /* Gtk+ 2.10 has the file name text entry box integrated in the dialog.
+         Show the C-l help text only for versions < 2.10.  */
+      if (gtk_check_version (2, 10, 0) && action != GTK_FILE_CHOOSER_ACTION_SAVE)
         strcat (message, "\nType C-l to display a file name text entry box.\n");
       strcat (message, "\nIf you don't like this file selector, use the "
               "corresponding\nkey binding or customize "
diff --git a/src/indent.c b/src/indent.c
index 8ea3ea66c1d..6a3cda9e9d5 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2074,7 +2074,7 @@ whether or not it is currently displayed in some window.  */)
     {
       int it_start;
       int oselective;
-      int start_on_image_or_stretch_or_string_p;
+      int it_overshoot_expected_p;
 
       SET_TEXT_POS (pt, PT, PT_BYTE);
       start_display (&it, w, pt);
@@ -2086,9 +2086,26 @@ whether or not it is currently displayed in some window.  */)
          while the end position is really at some X > 0, the same X that
          PT had.  */
       it_start = IT_CHARPOS (it);
-      start_on_image_or_stretch_or_string_p = (it.method == GET_FROM_IMAGE
-                                               || it.method == GET_FROM_STRETCH
-                                               || it.method == GET_FROM_STRING);
+
+      /* We expect the call to move_it_to, further down, to overshoot
+         if the starting point is on an image, stretch glyph, or Lisp
+         string.  We won't need to backtrack in this situation, except
+         for one corner case: when the Lisp string contains a
+         newline.  */
+      if (it.method == GET_FROM_STRING)
+        {
+          const char *s = SDATA (it.string);
+          const char *e = s + SBYTES (it.string);
+
+          while (s < e && *s != '\n')
+            ++s;
+
+          it_overshoot_expected_p = (s == e);
+        }
+      else
+        it_overshoot_expected_p = (it.method == GET_FROM_IMAGE
+                                   || it.method == GET_FROM_STRETCH);
+
       reseat_at_previous_visible_line_start (&it);
       it.current_x = it.hpos = 0;
       /* Temporarily disable selective display so we don't move too far */
@@ -2099,10 +2116,9 @@ whether or not it is currently displayed in some window.  */)
 
       /* Move back if we got too far.  This may happen if
          truncate-lines is on and PT is beyond right margin.
-         It may also happen if it_start is on an image, stretch
-         glyph, or string -- in that case, don't go back.  */
+         Don't go back if the overshoot is expected (see above).  */
       if (IT_CHARPOS (it) > it_start && XINT (lines) > 0
-          && !start_on_image_or_stretch_or_string_p)
+          && !it_overshoot_expected_p)
         move_it_by_lines (&it, -1, 0);
 
       it.vpos = 0;
diff --git a/src/keymap.c b/src/keymap.c
index 9720708ecf9..237bc0db9df 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -725,7 +725,10 @@ map_keymap_call (key, val, fun, dummy)
 DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 0,
        doc: /* Call FUNCTION once for each event binding in KEYMAP.
 FUNCTION is called with two arguments: the event that is bound, and
-the definition it is bound to.
+the definition it is bound to.  If the event is an integer, it may be
+a generic character (see Info node `(elisp)Splitting Characters'), and
+that means that all actual character events belonging to that generic
+character are bound to the definition.
 
 If KEYMAP has a parent, the parent's bindings are included as well.
 This works recursively: if the parent has itself a parent, then the
@@ -1176,7 +1179,7 @@ binding KEY to DEF is added at the front of KEYMAP.  */)
 
   meta_bit = VECTORP (key) ? meta_modifier : 0x80;
 
-  if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, make_number (0))))
+  if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, 0)))
     { /* DEF is apparently an XEmacs-style keyboard macro.  */
       Lisp_Object tmp = Fmake_vector (make_number (ASIZE (def)), Qnil);
       int i = ASIZE (def);
diff --git a/src/macterm.c b/src/macterm.c
index 03b96ac7f25..719b703a77c 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -110,6 +110,10 @@ static Lisp_Object last_window;
    (Not yet supported.)  */
 int x_use_underline_position_properties;
 
+/* Non-zero means to draw the underline at the same place as the descent line.  */
+
+int x_underline_at_descent_line;
+
 /* This is a chain of structures for all the X displays currently in
    use.  */
 
@@ -2632,6 +2636,11 @@ mac_compute_glyph_string_overhangs (s)
       Rect r;
       MacFontStruct *font = s->font;
 
+#if USE_CG_DRAWING
+      mac_prepare_for_quickdraw (s->f);
+#endif
+      SetPortWindowPort (FRAME_MAC_WINDOW (s->f));
+
       TextFont (font->mac_fontnum);
       TextSize (font->mac_fontsize);
       TextFace (font->mac_fontface);
@@ -3673,18 +3682,45 @@ x_draw_glyph_string (s)
       /* Draw underline.  */
       if (s->face->underline_p)
         {
-          unsigned long h = 1;
-          unsigned long dy = s->height - h;
+          unsigned long tem, h;
+          int y;
+
+#if 0
+          /* Get the underline thickness.  Default is 1 pixel.  */
+          if (!XGetFontProperty (s->font, XA_UNDERLINE_THICKNESS, &h))
+#endif
+            h = 1;
+
+          y = s->y + s->height - h;
+          if (!x_underline_at_descent_line)
+            {
+              /* Get the underline position.  This is the recommended
+                 vertical offset in pixels from the baseline to the top of
+                 the underline.  This is a signed value according to the
+                 specs, and its default is
+
+                 ROUND ((maximum descent) / 2), with
+                 ROUND(x) = floor (x + 0.5)  */
+
+#if 0
+              if (x_use_underline_position_properties
+                  && XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem))
+                y = s->ybase + (long) tem;
+              else
+#endif
+              if (s->face->font)
+                y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+            }
 
           if (s->face->underline_defaulted_p)
-            mac_fill_rectangle (s->f, s->gc, s->x, s->y + dy,
+            mac_fill_rectangle (s->f, s->gc, s->x, y,
                                 s->background_width, h);
           else
             {
               XGCValues xgcv;
               XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
               XSetForeground (s->display, s->gc, s->face->underline_color);
-              mac_fill_rectangle (s->f, s->gc, s->x, s->y + dy,
+              mac_fill_rectangle (s->f, s->gc, s->x, y,
                                   s->background_width, h);
               XSetForeground (s->display, s->gc, xgcv.foreground);
             }
@@ -7989,6 +8025,9 @@ XLoadQueryFont (Display *dpy, char *fontname)
       FontInfo the_fontinfo;
       int is_two_byte_font;
 
+#if USE_CG_DRAWING
+      mac_prepare_for_quickdraw (NULL);
+#endif
       /* Save the current font number used.  */
       GetPort (&port);
 #if TARGET_API_MAC_CARBON
@@ -8104,6 +8143,8 @@ XLoadQueryFont (Display *dpy, char *fontname)
                                              pcm->width);
             font->min_bounds.ascent   = min (font->min_bounds.ascent,
                                              pcm->ascent);
+            font->min_bounds.descent  = min (font->min_bounds.descent,
+                                             pcm->descent);
 
             font->max_bounds.lbearing = max (font->max_bounds.lbearing,
                                              pcm->lbearing);
@@ -8113,6 +8154,8 @@ XLoadQueryFont (Display *dpy, char *fontname)
                                              pcm->width);
             font->max_bounds.ascent   = max (font->max_bounds.ascent,
                                              pcm->ascent);
+            font->max_bounds.descent  = max (font->max_bounds.descent,
+                                             pcm->descent);
           }
       if (
 #if USE_ATSUI
@@ -11617,6 +11660,14 @@ to 4.1, set this to nil.
 NOTE: Not supported on Mac yet.  */);
   x_use_underline_position_properties = 0;
 
+  DEFVAR_BOOL ("x-underline-at-descent-line",
+               &x_underline_at_descent_line,
+     doc: /* *Non-nil means to draw the underline at the same place as the descent line.
+nil means to draw the underline according to the value of the variable
+`x-use-underline-position-properties', which is usually at the baseline
+level.  The default value is nil.  */);
+  x_underline_at_descent_line = 0;
+
   DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
     doc: /* If not nil, Emacs uses toolkit scroll bars.  */);
 #ifdef USE_TOOLKIT_SCROLL_BARS
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ec407c883f3..98ecc759034 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -719,6 +719,8 @@ $(BLD)/fns.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/src/config.h \
+        $(EMACS_ROOT)/nt/inc/langinfo.h \
+        $(EMACS_ROOT)/nt/inc/nl_types.h \
         $(SRC)/atimer.h \
         $(SRC)/blockinput.h \
         $(SRC)/buffer.h \
@@ -1044,6 +1046,8 @@ $(BLD)/w32proc.$(O) : \
         $(SRC)/w32proc.c \
         $(SRC)/s/ms-w32.h \
         $(SRC)/m/intel386.h \
+        $(EMACS_ROOT)/nt/inc/langinfo.h \
+        $(EMACS_ROOT)/nt/inc/nl_types.h \
         $(SRC)/config.h \
         $(SRC)/process.h \
         $(SRC)/syssignal.h \
diff --git a/src/minibuf.c b/src/minibuf.c
index 63eee29c494..9505c22d39e 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1021,7 +1021,7 @@ DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0,
 Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
 is a string to insert in the minibuffer before reading.
 \(INITIAL-CONTENTS can also be a cons of a string and an integer.  Such
-arguments are used as in `read-from-minibuffer')  */)
+arguments are used as in `read-from-minibuffer'.)  */)
      (prompt, initial_contents)
      Lisp_Object prompt, initial_contents;
 {
@@ -1910,7 +1910,7 @@ DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete
 If the argument FLAG is nil, invoke `try-completion', if it's t, invoke
 `all-completions', otherwise invoke `test-completion'.
 
-The arguments STRING and PREDICATE are as in  `try-completion',
+The arguments STRING and PREDICATE are as in `try-completion',
 `all-completions', and `test-completion'. */)
      (string, predicate, flag)
      Lisp_Object string, predicate, flag;
@@ -2402,7 +2402,7 @@ The optional second arg COMMON-SUBSTRING is a string.
 It is used to put faces, `completions-first-difference' and
 `completions-common-part' on the completion buffer. The
 `completions-common-part' face is put on the common substring
-specified by COMMON-SUBSTRING. If COMMON-SUBSTRING is nil
+specified by COMMON-SUBSTRING.  If COMMON-SUBSTRING is nil
 and the current buffer is not the minibuffer, the faces are not put.
 Internally, COMMON-SUBSTRING is bound to `completion-common-substring'
 during running `completion-setup-hook'. */)
diff --git a/src/regex.c b/src/regex.c
index 09776848220..05f1fb53b1a 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3989,7 +3989,13 @@ analyse_first (p, pend, fastmap, multibyte)
           for (j = CHARSET_BITMAP_SIZE (&p[-1]) * BYTEWIDTH - 1, p++;
                j >= 0; j--)
             if (!!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) ^ not)
-              fastmap[j] = 1;
+              {
+                fastmap[j] = 1;
+#ifdef emacs
+                if (j >= 0x80 && j < 0xa0)
+                  fastmap[LEADING_CODE_8_BIT_CONTROL] = 1;
+#endif
+              }
 
           if ((not && multibyte)
               /* Any leading code can possibly start a character
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 817f1facdee..55d9a725293 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -142,8 +142,12 @@ Boston, MA 02110-1301, USA.  */
    movemail.c will use `maillock' when MAILDIR, HAVE_LIBMAIL and
    HAVE_MAILLOCK_H are defined, so the following appears to be the
    correct logic.  -- fx */
+/* We must check for HAVE_LIBLOCKFILE too, as movemail does.
+   liblockfile is a Free Software replacement for libmail, used on
+   Debian systems and elsewhere. -rfr */
 
-#if !(defined (HAVE_LIBMAIL) && defined (HAVE_MAILLOCK_H))
+#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) && \
+      defined (HAVE_MAILLOCK_H))
 #define MAIL_USE_FLOCK
 #endif
 
diff --git a/src/search.c b/src/search.c
index 72ce7e79559..5f3f953595b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -138,10 +138,11 @@ compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
   cp->buf.target_multibyte = multibyte;
   cp->whitespace_regexp = Vsearch_spaces_regexp;
   cp->syntax_table = current_buffer->syntax_table;
-  /* Doing BLOCK_INPUT here has the effect that
-     the debugger won't run if an error occurs.
-     Why is BLOCK_INPUT needed here?  */
-  BLOCK_INPUT;
+  /* rms: I think BLOCK_INPUT is not needed here any more,
+     because regex.c defines malloc to call xmalloc.
+     Using BLOCK_INPUT here means the debugger won't run if an error occurs.
+     So let's turn it off.  */
+  /*  BLOCK_INPUT;  */
   old = re_set_syntax (RE_SYNTAX_EMACS
                        | (posix ? 0 : RE_NO_POSIX_BACKTRACKING));
   re_set_whitespace_regexp (NILP (Vsearch_spaces_regexp) ? NULL
@@ -153,7 +154,7 @@ compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
   re_set_whitespace_regexp (NULL);
 
   re_set_syntax (old);
-  UNBLOCK_INPUT;
+  /* UNBLOCK_INPUT;  */
   if (val)
     xsignal1 (Qinvalid_regexp, build_string (val));
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 7fd90d7e75a..f2e456b85bf 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8671,14 +8671,15 @@ syms_of_w32fns ()
   Vw32_color_map = Qnil;
 
   DEFVAR_LISP ("w32-pass-alt-to-system", &Vw32_pass_alt_to_system,
-               doc: /* Non-nil if alt key presses are passed on to Windows.
-When non-nil, for example, alt pressed and released and then space will
-open the System menu.  When nil, Emacs silently swallows alt key events.  */);
+               doc: /* Non-nil if Alt key presses are passed on to Windows.
+When non-nil, for example, Alt pressed and released and then space will
+open the System menu.  When nil, Emacs processes the Alt key events, and
+then silently swallows them.  */);
   Vw32_pass_alt_to_system = Qnil;
 
   DEFVAR_LISP ("w32-alt-is-meta", &Vw32_alt_is_meta,
-               doc: /* Non-nil if the alt key is to be considered the same as the meta key.
-When nil, Emacs will translate the alt key to the Alt modifier, and not Meta.  */);
+               doc: /* Non-nil if the Alt key is to be considered the same as the META key.
+When nil, Emacs will translate the Alt key to the ALT modifier, not to META.  */);
   Vw32_alt_is_meta = Qt;
 
   DEFVAR_INT ("w32-quit-key", &w32_quit_key,
@@ -8687,14 +8688,32 @@ When nil, Emacs will translate the alt key to the Alt modifier, and not Meta.  *
 
   DEFVAR_LISP ("w32-pass-lwindow-to-system",
                &Vw32_pass_lwindow_to_system,
-               doc: /* Non-nil if the left \"Windows\" key is passed on to Windows.
-When non-nil, the Start menu is opened by tapping the key.  */);
+               doc: /* If non-nil, the left \"Windows\" key is passed on to Windows.
+
+When non-nil, the Start menu is opened by tapping the key.
+If you set this to nil, the left \"Windows\" key is processed by Emacs
+according to the value of `w32-lwindow-modifier', which see.
+
+Note that some combinations of the left \"Windows\" key with other keys are
+caught by Windows at low level, and so binding them in Emacs will have no
+effect.  For example, <lwindow>-r always pops up the Windows Run dialog,
+<lwindow>-<Pause> pops up the "System Properties" dialog, etc.  However, see
+the doc string of `w32-phantom-key-code'.  */);
   Vw32_pass_lwindow_to_system = Qt;
 
   DEFVAR_LISP ("w32-pass-rwindow-to-system",
                &Vw32_pass_rwindow_to_system,
-               doc: /* Non-nil if the right \"Windows\" key is passed on to Windows.
-When non-nil, the Start menu is opened by tapping the key.  */);
+               doc: /* If non-nil, the right \"Windows\" key is passed on to Windows.
+
+When non-nil, the Start menu is opened by tapping the key.
+If you set this to nil, the right \"Windows\" key is processed by Emacs
+according to the value of `w32-rwindow-modifier', which see.
+
+Note that some combinations of the right \"Windows\" key with other keys are
+caught by Windows at low level, and so binding them in Emacs will have no
+effect.  For example, <rwindow>-r always pops up the Windows Run dialog,
+<rwindow>-<Pause> pops up the "System Properties" dialog, etc.  However, see
+the doc string of `w32-phantom-key-code'.  */);
   Vw32_pass_rwindow_to_system = Qt;
 
   DEFVAR_LISP ("w32-phantom-key-code",
@@ -8711,29 +8730,29 @@ acting on \"Windows\" key events when `w32-pass-lwindow-to-system' or
 
   DEFVAR_LISP ("w32-enable-num-lock",
                &Vw32_enable_num_lock,
-               doc: /* Non-nil if Num Lock should act normally.
-Set to nil to see Num Lock as the key `kp-numlock'.  */);
+               doc: /* If non-nil, the Num Lock key acts normally.
+Set to nil to handle Num Lock as the `kp-numlock' key.  */);
   Vw32_enable_num_lock = Qt;
 
   DEFVAR_LISP ("w32-enable-caps-lock",
                &Vw32_enable_caps_lock,
-               doc: /* Non-nil if Caps Lock should act normally.
-Set to nil to see Caps Lock as the key `capslock'.  */);
+               doc: /* If non-nil, the Caps Lock key acts normally.
+Set to nil to handle Caps Lock as the `capslock' key.  */);
   Vw32_enable_caps_lock = Qt;
 
   DEFVAR_LISP ("w32-scroll-lock-modifier",
                &Vw32_scroll_lock_modifier,
-               doc: /* Modifier to use for the Scroll Lock on state.
+               doc: /* Modifier to use for the Scroll Lock ON state.
 The value can be hyper, super, meta, alt, control or shift for the
-respective modifier, or nil to see Scroll Lock as the key `scroll'.
-Any other value will cause the key to be ignored.  */);
+respective modifier, or nil to handle Scroll Lock as the `scroll' key.
+Any other value will cause the Scroll Lock key to be ignored.  */);
   Vw32_scroll_lock_modifier = Qt;
 
   DEFVAR_LISP ("w32-lwindow-modifier",
                &Vw32_lwindow_modifier,
                doc: /* Modifier to use for the left \"Windows\" key.
 The value can be hyper, super, meta, alt, control or shift for the
-respective modifier, or nil to appear as the key `lwindow'.
+respective modifier, or nil to appear as the `lwindow' key.
 Any other value will cause the key to be ignored.  */);
   Vw32_lwindow_modifier = Qnil;
 
@@ -8741,7 +8760,7 @@ Any other value will cause the key to be ignored.  */);
                &Vw32_rwindow_modifier,
                doc: /* Modifier to use for the right \"Windows\" key.
 The value can be hyper, super, meta, alt, control or shift for the
-respective modifier, or nil to appear as the key `rwindow'.
+respective modifier, or nil to appear as the `rwindow' key.
 Any other value will cause the key to be ignored.  */);
   Vw32_rwindow_modifier = Qnil;
 
@@ -8749,7 +8768,7 @@ Any other value will cause the key to be ignored.  */);
                &Vw32_apps_modifier,
                doc: /* Modifier to use for the \"Apps\" key.
 The value can be hyper, super, meta, alt, control or shift for the
-respective modifier, or nil to appear as the key `apps'.
+respective modifier, or nil to appear as the `apps' key.
 Any other value will cause the key to be ignored.  */);
   Vw32_apps_modifier = Qnil;
 
@@ -8765,7 +8784,7 @@ Any other value will cause the key to be ignored.  */);
               &w32_mouse_button_tolerance,
               doc: /* Analogue of double click interval for faking middle mouse events.
 The value is the minimum time in milliseconds that must elapse between
-left/right button down events before they are considered distinct events.
+left and right button down events before they are considered distinct events.
 If both mouse buttons are depressed within this interval, a middle mouse
 button down event is generated instead.  */);
   w32_mouse_button_tolerance = GetDoubleClickTime () / 2;
@@ -8780,7 +8799,7 @@ reported as lisp events.  */);
 
   DEFVAR_BOOL ("w32-pass-extra-mouse-buttons-to-system",
                &w32_pass_extra_mouse_buttons_to_system,
-               doc: /* Non-nil if the fourth and fifth mouse buttons are passed to Windows.
+               doc: /* If non-nil, the fourth and fifth mouse buttons are passed to Windows.
 Recent versions of Windows support mice with up to five buttons.
 Since most applications don't support these extra buttons, most mouse
 drivers will allow you to map them to functions at the system level.
diff --git a/src/w32proc.c b/src/w32proc.c
index d874d183b17..29491931015 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -49,6 +49,11 @@ Boston, MA 02110-1301, USA.
 extern BOOL WINAPI IsValidLocale(LCID, DWORD);
 #endif
 
+#ifdef HAVE_LANGINFO_CODESET
+#include <nl_types.h>
+#include <langinfo.h>
+#endif
+
 #include "lisp.h"
 #include "w32.h"
 #include "w32heap.h"
@@ -1817,6 +1822,69 @@ If successful, the return value is t, otherwise nil.  */)
   return result;
 }
 
+#ifdef HAVE_LANGINFO_CODESET
+/* Emulation of nl_langinfo.  Used in fns.c:Flocale_info.  */
+char *nl_langinfo (nl_item item)
+{
+  /* Conversion of Posix item numbers to their Windows equivalents.  */
+  static const LCTYPE w32item[] = {
+    LOCALE_IDEFAULTANSICODEPAGE,
+    LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3,
+    LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, LOCALE_SDAYNAME7,
+    LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3,
+    LOCALE_SMONTHNAME4, LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6,
+    LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, LOCALE_SMONTHNAME9,
+    LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12
+  };
+
+  static char *nl_langinfo_buf = NULL;
+  static int   nl_langinfo_len = 0;
+
+  if (nl_langinfo_len <= 0)
+    nl_langinfo_buf = xmalloc (nl_langinfo_len = 1);
+
+  if (item < 0 || item >= _NL_NUM)
+    nl_langinfo_buf[0] = 0;
+  else
+    {
+      LCID cloc = GetThreadLocale ();
+      int need_len = GetLocaleInfo (cloc, w32item[item] | LOCALE_USE_CP_ACP,
+                                    NULL, 0);
+
+      if (need_len <= 0)
+        nl_langinfo_buf[0] = 0;
+      else
+        {
+          if (item == CODESET)
+            {
+              need_len += 2;    /* for the "cp" prefix */
+              if (need_len < 8) /* for the case we call GetACP */
+                need_len = 8;
+            }
+          if (nl_langinfo_len <= need_len)
+            nl_langinfo_buf = xrealloc (nl_langinfo_buf,
+                                        nl_langinfo_len = need_len);
+          if (!GetLocaleInfo (cloc, w32item[item] | LOCALE_USE_CP_ACP,
+                              nl_langinfo_buf, nl_langinfo_len))
+            nl_langinfo_buf[0] = 0;
+          else if (item == CODESET)
+            {
+              if (strcmp (nl_langinfo_buf, "0") == 0 /* CP_ACP */
+                  || strcmp (nl_langinfo_buf, "1") == 0) /* CP_OEMCP */
+                sprintf (nl_langinfo_buf, "cp%u", GetACP ());
+              else
+                {
+                  memmove (nl_langinfo_buf + 2, nl_langinfo_buf,
+                           strlen (nl_langinfo_buf) + 1);
+                  nl_langinfo_buf[0] = 'c';
+                  nl_langinfo_buf[1] = 'p';
+                }
+            }
+        }
+    }
+  return nl_langinfo_buf;
+}
+#endif  /* HAVE_LANGINFO_CODESET */
 
 DEFUN ("w32-get-locale-info", Fw32_get_locale_info,
        Sw32_get_locale_info, 1, 2, 0,
diff --git a/src/window.c b/src/window.c
index 2a3d29a8da8..a78360cda2f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -333,6 +333,7 @@ Return nil if that position is scrolled vertically out of view.
 If a character is only partially visible, nil is returned, unless the
 optional argument PARTIALLY is non-nil.
 If POS is only out of view because of horizontal scrolling, return non-nil.
+If POS is t, it specifies the position of the last visible glyph in WINDOW.
 POS defaults to point in WINDOW; WINDOW defaults to the selected window.
 
 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
@@ -340,7 +341,7 @@ return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]),
 where X and Y are the pixel coordinates relative to the top left corner
 of the window.  The remaining elements are omitted if the character after
 POS is fully visible; otherwise, RTOP and RBOT are the number of pixels
-off-screen at the top and bottom of the row, ROWH is the height of the
+off-window at the top and bottom of the row, ROWH is the height of the
 display row, and VPOS is the row number (0-based) containing POS.  */)
      (pos, window, partially)
      Lisp_Object pos, window, partially;
@@ -357,7 +358,9 @@ display row, and VPOS is the row number (0-based) containing POS.  */)
   buf = XBUFFER (w->buffer);
   SET_TEXT_POS_FROM_MARKER (top, w->start);
 
-  if (!NILP (pos))
+  if (EQ (pos, Qt))
+    posint = -1;
+  else if (!NILP (pos))
     {
       CHECK_NUMBER_COERCE_MARKER (pos);
       posint = XINT (pos);
@@ -369,8 +372,8 @@ display row, and VPOS is the row number (0-based) containing POS.  */)
 
   /* If position is above window start or outside buffer boundaries,
      or if window start is out of range, position is not visible.  */
-  if (posint >= CHARPOS (top)
-      && posint <= BUF_ZV (buf)
+  if ((EQ (pos, Qt)
+       || (posint >= CHARPOS (top) && posint <= BUF_ZV (buf)))
       && CHARPOS (top) >= BUF_BEGV (buf)
       && CHARPOS (top) <= BUF_ZV (buf)
       && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, &rowh, &vpos)
@@ -402,10 +405,10 @@ counts from the end of the window.
 
 Value is a list (HEIGHT VPOS YPOS OFFBOT), where HEIGHT is the height
 in pixels of the visible part of the line, VPOS and YPOS are the
-vertical position in lines and pixels of the row, relative to the top
-of the first text line, and OFFBOT is the number of off-screen pixels at
-the bottom of the text row.  If there are off-screen pixels at the top
-of the (first) text row, YPOS is negative.
+vertical position in lines and pixels of the line, relative to the top
+of the first text line, and OFFBOT is the number of off-window pixels at
+the bottom of the text line.  If there are off-window pixels at the top
+of the (first) text line, YPOS is negative.
 
 Return nil if window display is not up-to-date.  In that case, use
 `pos-visible-in-window-p' to obtain the information.  */)
@@ -565,7 +568,7 @@ DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0,
 Return NCOL.  NCOL should be zero or positive.
 
 Note that if `automatic-hscrolling' is non-nil, you cannot scroll the
-window so that the location of point moves off-screen.  */)
+window so that the location of point moves off-window.  */)
      (window, ncol)
      Lisp_Object window, ncol;
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index 9ab61c09c2a..7ca259e2b10 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1284,6 +1284,7 @@ line_bottom_y (it)
 
 
 /* Return 1 if position CHARPOS is visible in window W.
+   CHARPOS < 0 means return info about WINDOW_END position.
    If visible, set *X and *Y to pixel coordinates of top left corner.
    Set *RTOP and *RBOT to pixel height of an invisible area of glyph at POS.
    Set *ROWH and *VPOS to row's visible height and VPOS (row number).  */
@@ -1322,10 +1323,10 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, rowh, vpos)
 
   start_display (&it, w, top);
   move_it_to (&it, charpos, -1, it.last_visible_y-1, -1,
-              MOVE_TO_POS | MOVE_TO_Y);
+              (charpos >= 0 ? MOVE_TO_POS : 0) | MOVE_TO_Y);
 
   /* Note that we may overshoot because of invisible text.  */
-  if (IT_CHARPOS (it) >= charpos)
+  if (charpos >= 0 && IT_CHARPOS (it) >= charpos)
     {
       int top_x = it.current_x;
       int top_y = it.current_y;
@@ -3254,7 +3255,9 @@ handle_fontified_prop (it)
       && !NILP (Vrun_hooks)
       && (pos = make_number (IT_CHARPOS (*it)),
           prop = Fget_char_property (pos, Qfontified, Qnil),
-          NILP (prop)))
+          /* Ignore the special cased nil value always present at EOB since
+             no amount of fontifying will be able to change it.  */
+          NILP (prop) && IT_CHARPOS (*it) < Z))
     {
       int count = SPECPDL_INDEX ();
       Lisp_Object val;
diff --git a/src/xfns.c b/src/xfns.c
index c60035e41c2..419eccb308e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5904,7 +5904,7 @@ chooser to show or not show hidden files on a case by case basis.  */);
   x_gtk_show_hidden_files = 0;
 
   DEFVAR_BOOL ("x-gtk-file-dialog-help-text", &x_gtk_file_dialog_help_text,
-    doc: /* *If non-nil, the GTK file chooser will by show additional help text.
+    doc: /* *If non-nil, the GTK file chooser will show additional help text.
 If more space for files in the file chooser dialog is wanted, set this to nil
 to turn the additional text off.  */);
   x_gtk_file_dialog_help_text = 1;