Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-664
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-665
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-666
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-447

12 files changed, 251 insertions, 128 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 256172630ef..4fa4093631f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,66 @@
+2005-12-07  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+
+        * xfns.c (Fx_create_frame): Initialize Vdefault_minibuffer_frame,
+        when needed.
+
+2005-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (keys_of_minibuf): Just unbind SPC in
+        Vminibuffer_local_filename_completion_map rather than forcing it
+        explicitly to the same binding as the global map.
+
+2005-12-06  Ken Raeburn  <raeburn@gnu.org>
+
+        * buffer.c (Fkill_buffer): Avoid dangerous side effects in NILP
+        argument.
+        * bytecode.c (Fbyte_code): Likewise.
+        * fileio.c (internal_delete_file, Fread_file_name_internal):
+        Likewise.
+        * minibuf.c (Fminibuffer_complete_and_exit): Likewise.
+        * undo.c (truncate_undo_list): Likewise.
+
+2005-12-05  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (enlarge_window): Eliminate arg preserve_before.
+        Assume it is 0.  All callers changed.
+        (Fenlarge_window, Fshrink_window): Likewise.
+
+2005-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (compute_tip_xy): Put tip above pointer if it doesn't
+        fit below.
+
+2005-12-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.h: Add prototype for xg_set_icon_from_xpm_data.
+
+        * xfns.c (x_real_positions): int ign => unsigned int.
+        (xg_set_icon_from_xpm_data): Remove unused variable err.
+        (x_set_name_internal, Fx_create_frame, xg_set_icon): Add cast
+        to remove compiler warning.
+        (compute_tip_xy): Put tip above pointer if it doesn't fit below.
+
+2005-12-02  David Reitter  <david.reitter@gmail.com>
+
+        * minibuf.c (Fcompleting_read): If Vminibuffer_completing_file_name is
+        non-nil, use the new keymaps Vminibuffer_local_filename_completion_map
+        and Vminibuffer_local_must_match_filename_map keymaps.
+        (keys_of_minibuf): Bind SPC in the new file-name completion keymaps.
+
+        * keymap.c (Vminibuffer_local_filename_completion_map)
+        (Vminibuffer_local_must_match_filename_map): New variables.
+        (syms_of_keymap): DEFVAR_LISP them, initialize them, and set their
+        parent to be Vminibuffer_local_completion_map and
+        Vminibuffer_local_must_match_map, respectively.
+
+        * commands.h (Vminibuffer_local_filename_completion_map)
+        (Vminibuffer_local_must_match_filename_map): Declare the new keymaps.
+
+2005-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (Fset_window_configuration): Don't accidentally copy the
+        window-point of one window to another.
+
 2005-11-30  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
 
         * buffer.c (Fpop_to_buffer): Remove superfluous call to record_buffer.
@@ -55,7 +118,7 @@
         * macterm.h (cfstring_to_lisp_nodecode) [TARGET_API_MAC_CARBON]:
         Add prototype.
 
-2005-11-21  Ken Raeburn  <raeburn@mit.edu>
+2005-11-21  Ken Raeburn  <raeburn@gnu.org>
 
         * keymap.c (shadow_lookup): Use make_number to pass a number to
         Fsubstring.
@@ -16289,7 +16352,7 @@
         * xdisp.c (forward_to_next_line_start): Return 0 when reaching the
         end of the buffer.
 
-2002-08-08  Ken Raeburn  <raeburn@mit.edu>
+2002-08-08  Ken Raeburn  <raeburn@gnu.org>
 
         * coding.c (Ffind_operation_coding_system): Fix Lisp_Object/int mixup.
 
diff --git a/src/buffer.c b/src/buffer.c
index a20f6a2d683..d52a710573e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1359,7 +1359,8 @@ with SIGHUP.  */)
     /* First run the query functions; if any query is answered no,
        don't kill the buffer.  */
     arglist[0] = Qkill_buffer_query_functions;
-    if (NILP (Frun_hook_with_args_until_failure (1, arglist)))
+    tem = Frun_hook_with_args_until_failure (1, arglist);
+    if (NILP (tem))
       return unbind_to (count, Qnil);
 
     /* Then run the hooks.  */
diff --git a/src/bytecode.c b/src/bytecode.c
index e23d835cf10..af09061dbc3 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -524,15 +524,19 @@ If the third argument is incorrect, Emacs may crash.  */)
           }
 
         case Bgotoifnil:
-          MAYBE_GC ();
-          op = FETCH2;
-          if (NILP (POP))
-            {
-              BYTE_CODE_QUIT;
-              CHECK_RANGE (op);
-              stack.pc = stack.byte_string_start + op;
-            }
-          break;
+          {
+            Lisp_Object v1;
+            MAYBE_GC ();
+            op = FETCH2;
+            v1 = POP;
+            if (NILP (v1))
+              {
+                BYTE_CODE_QUIT;
+                CHECK_RANGE (op);
+                stack.pc = stack.byte_string_start + op;
+              }
+            break;
+          }
 
         case Bcar:
           {
@@ -730,15 +734,19 @@ If the third argument is incorrect, Emacs may crash.  */)
           break;
 
         case Bgotoifnonnil:
-          MAYBE_GC ();
-          op = FETCH2;
-          if (!NILP (POP))
-            {
-              BYTE_CODE_QUIT;
-              CHECK_RANGE (op);
-              stack.pc = stack.byte_string_start + op;
-            }
-          break;
+          {
+            Lisp_Object v1;
+            MAYBE_GC ();
+            op = FETCH2;
+            v1 = POP;
+            if (!NILP (v1))
+              {
+                BYTE_CODE_QUIT;
+                CHECK_RANGE (op);
+                stack.pc = stack.byte_string_start + op;
+              }
+            break;
+          }
 
         case Bgotoifnilelsepop:
           MAYBE_GC ();
@@ -771,24 +779,32 @@ If the third argument is incorrect, Emacs may crash.  */)
           break;
 
         case BRgotoifnil:
-          MAYBE_GC ();
-          if (NILP (POP))
-            {
-              BYTE_CODE_QUIT;
-              stack.pc += (int) *stack.pc - 128;
-            }
-          stack.pc++;
-          break;
+          {
+            Lisp_Object v1;
+            MAYBE_GC ();
+            v1 = POP;
+            if (NILP (v1))
+              {
+                BYTE_CODE_QUIT;
+                stack.pc += (int) *stack.pc - 128;
+              }
+            stack.pc++;
+            break;
+          }
 
         case BRgotoifnonnil:
-          MAYBE_GC ();
-          if (!NILP (POP))
-            {
-              BYTE_CODE_QUIT;
-              stack.pc += (int) *stack.pc - 128;
-            }
-          stack.pc++;
-          break;
+          {
+            Lisp_Object v1;
+            MAYBE_GC ();
+            v1 = POP;
+            if (!NILP (v1))
+              {
+                BYTE_CODE_QUIT;
+                stack.pc += (int) *stack.pc - 128;
+              }
+            stack.pc++;
+            break;
+          }
 
         case BRgotoifnilelsepop:
           MAYBE_GC ();
diff --git a/src/commands.h b/src/commands.h
index 7ad593577ad..c1330af273e 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -37,9 +37,16 @@ extern Lisp_Object Vminibuffer_local_ns_map;
 /* keymap used for minibuffers when doing completion */
 extern Lisp_Object Vminibuffer_local_completion_map;
 
+/* keymap used for minibuffers when doing completion in filenames*/
+extern Lisp_Object Vminibuffer_local_filename_completion_map;
+
 /* keymap used for minibuffers when doing completion and require a match */
 extern Lisp_Object Vminibuffer_local_must_match_map;
 
+/* keymap used for minibuffers when doing completion in filenames
+   and require a match */
+extern Lisp_Object Vminibuffer_local_must_match_filename_map;
+
 /* Last character of last key sequence.  */
 extern Lisp_Object last_command_char;
 
diff --git a/src/fileio.c b/src/fileio.c
index b7262b6c58b..40e3a3c6e6c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2732,8 +2732,10 @@ int
 internal_delete_file (filename)
      Lisp_Object filename;
 {
-  return NILP (internal_condition_case_1 (Fdelete_file, filename,
-                                          Qt, internal_delete_file_1));
+  Lisp_Object tem;
+  tem = internal_condition_case_1 (Fdelete_file, filename,
+                                   Qt, internal_delete_file_1);
+  return NILP (tem);
 }
 
 DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,
@@ -6236,13 +6238,17 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte
 #endif
         {
           /* Must do it the hard (and slow) way.  */
+          Lisp_Object tem;
           GCPRO3 (all, comp, specdir);
           count = SPECPDL_INDEX ();
           record_unwind_protect (read_file_name_cleanup, current_buffer->directory);
           current_buffer->directory = realdir;
           for (comp = Qnil; CONSP (all); all = XCDR (all))
-            if (!NILP (call1 (Vread_file_name_predicate, XCAR (all))))
-              comp = Fcons (XCAR (all), comp);
+            {
+              tem = call1 (Vread_file_name_predicate, XCAR (all));
+              if (!NILP (tem))
+                comp = Fcons (XCAR (all), comp);
+            }
           unbind_to (count, Qnil);
           UNGCPRO;
         }
diff --git a/src/keymap.c b/src/keymap.c
index a6d5ccbbc2d..36517cf0794 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -66,6 +66,13 @@ Lisp_Object Vminibuffer_local_ns_map;
 /* was MinibufLocalCompletionMap */
 Lisp_Object Vminibuffer_local_completion_map;
 
+/* keymap used for minibuffers when doing completion in filenames */
+Lisp_Object Vminibuffer_local_filename_completion_map;
+
+/* keymap used for minibuffers when doing completion in filenames 
+   with require-match*/
+Lisp_Object Vminibuffer_local_must_match_filename_map;
+
 /* keymap used for minibuffers when doing completion and require a match */
 /* was MinibufLocalMustMatchMap */
 Lisp_Object Vminibuffer_local_must_match_map;
@@ -3775,12 +3782,27 @@ don't alter it yourself.  */);
   Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil);
   Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map);
 
+  DEFVAR_LISP ("minibuffer-local-filename-completion-map", 
+               &Vminibuffer_local_filename_completion_map,
+               doc: /* Local keymap for minibuffer input with completion for filenames.  */);
+  Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil);
+  Fset_keymap_parent (Vminibuffer_local_filename_completion_map, 
+                      Vminibuffer_local_completion_map);
+
+
   DEFVAR_LISP ("minibuffer-local-must-match-map", &Vminibuffer_local_must_match_map,
                doc: /* Local keymap for minibuffer input with completion, for exact match.  */);
   Vminibuffer_local_must_match_map = Fmake_sparse_keymap (Qnil);
   Fset_keymap_parent (Vminibuffer_local_must_match_map,
                       Vminibuffer_local_completion_map);
 
+  DEFVAR_LISP ("minibuffer-local-must-match-filename-map", 
+               &Vminibuffer_local_must_match_filename_map,
+               doc: /* Local keymap for minibuffer input with completion for filenames with exact match.  */);
+  Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil);
+  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, 
+                      Vminibuffer_local_must_match_map);
+
   DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,
                doc: /* Alist of keymaps to use for minor modes.
 Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read
diff --git a/src/minibuf.c b/src/minibuf.c
index 4aa6dde6cac..2efb3cf4817 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1753,8 +1753,12 @@ Completion ignores case if the ambient value of
     XSETFASTINT (histpos, 0);
 
   val = read_minibuf (NILP (require_match)
-                      ? Vminibuffer_local_completion_map
-                      : Vminibuffer_local_must_match_map,
+                      ? (NILP (Vminibuffer_completing_file_name)
+                         ? Vminibuffer_local_completion_map
+                         : Vminibuffer_local_filename_completion_map)
+                      : (NILP (Vminibuffer_completing_file_name)
+                         ? Vminibuffer_local_must_match_map
+                         : Vminibuffer_local_must_match_filename_map),
                       init, prompt, make_number (pos), 0,
                       histvar, histpos, def, 0,
                       !NILP (inherit_input_method), 0);
@@ -2118,16 +2122,17 @@ a repetition of this command will exit.  */)
      ()
 {
   register int i;
-  Lisp_Object val;
+  Lisp_Object val, tem;
 
   /* Allow user to specify null string */
   if (XINT (Fminibuffer_prompt_end ()) == ZV)
     goto exit;
 
   val = Fminibuffer_contents ();
-  if (!NILP (Ftest_completion (val,
-                               Vminibuffer_completion_table,
-                               Vminibuffer_completion_predicate)))
+  tem = Ftest_completion (val,
+                          Vminibuffer_completion_table,
+                          Vminibuffer_completion_predicate);
+  if (!NILP (tem))
     {
       if (completion_ignore_case)
         { /* Fixup case of the field, if necessary. */
@@ -2927,10 +2932,16 @@ keys_of_minibuf ()
   initial_define_key (Vminibuffer_local_completion_map, '?',
                       "minibuffer-completion-help");
 
+  Fdefine_key (Vminibuffer_local_filename_completion_map,
+               build_string (" "), Qnil);
+
   initial_define_key (Vminibuffer_local_must_match_map, Ctl ('m'),
                       "minibuffer-complete-and-exit");
   initial_define_key (Vminibuffer_local_must_match_map, Ctl ('j'),
                       "minibuffer-complete-and-exit");
+
+  initial_define_key (Vminibuffer_local_must_match_filename_map, ' ',
+                      "self-insert-command");
 }
 
 /* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73
diff --git a/src/undo.c b/src/undo.c
index 9839906ca7e..ecbb714fddd 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -378,11 +378,11 @@ truncate_undo_list (b)
       && size_so_far > XINT (Vundo_outer_limit)
       && !NILP (Vundo_outer_limit_function))
     {
-      Lisp_Object temp = last_undo_buffer;
+      Lisp_Object temp = last_undo_buffer, tem;
 
       /* Normally the function this calls is undo-outer-limit-truncate.  */
-      if (! NILP (call1 (Vundo_outer_limit_function,
-                         make_number (size_so_far))))
+      tem = call1 (Vundo_outer_limit_function, make_number (size_so_far));
+      if (! NILP (tem))
         {
           /* The function is responsible for making
              any desired changes in buffer-undo-list.  */
diff --git a/src/w32fns.c b/src/w32fns.c
index e18ee3d43a9..6fc6c860808 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7413,6 +7413,9 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
     *root_y = XINT (top);
   else if (*root_y + XINT (dy) - height < 0)
     *root_y -= XINT (dy);
+  /* If there's not enough place below the pointer, put tip above it.  */
+  else if (*root_y + XINT (dy) >= FRAME_W32_DISPLAY_INFO (f)->height)
+    *root_y -= XINT (dy);
   else
     {
       *root_y -= height;
diff --git a/src/window.c b/src/window.c
index 2d974b4647f..dd80f629e1e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -67,7 +67,7 @@ static int window_min_size P_ ((struct window *, int, int, int *));
 static void size_window P_ ((Lisp_Object, int, int, int));
 static int freeze_window_start P_ ((struct window *, void *));
 static int window_fixed_size_p P_ ((struct window *, int, int));
-static void enlarge_window P_ ((Lisp_Object, int, int, int));
+static void enlarge_window P_ ((Lisp_Object, int, int));
 static Lisp_Object window_list P_ ((void));
 static int add_window_to_list P_ ((struct window *, void *));
 static int candidate_window_p P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
@@ -1971,7 +1971,7 @@ window_loop (type, obj, mini, frames)
   GCPRO1 (windows);
   best_window = Qnil;
 
-  for (; CONSP (windows); windows = CDR (windows))
+  for (; CONSP (windows); windows = XCDR (windows))
     {
       struct window *w;
 
@@ -3592,7 +3592,7 @@ displayed.  */)
                            + XFASTINT (XWINDOW (window)->total_lines));
               enlarge_window (upper,
                               total / 2 - XFASTINT (XWINDOW (upper)->total_lines),
-                              0, 0);
+                              0);
             }
         }
     }
@@ -3669,7 +3669,7 @@ temp_output_buffer_show (buf)
 #endif
   set_buffer_internal (old);
 
-  if (!EQ (Vtemp_buffer_show_function, Qnil))
+  if (!NILP (Vtemp_buffer_show_function))
     call1 (Vtemp_buffer_show_function, buf);
   else
     {
@@ -3883,21 +3883,18 @@ See Info node `(elisp)Splitting Windows' for more details and examples.*/)
   return new;
 }
 
-DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 3, "p",
+DEFUN ("enlarge-window", Fenlarge_window, Senlarge_window, 1, 2, "p",
        doc: /* Make current window ARG lines bigger.
 From program, optional second arg non-nil means grow sideways ARG columns.
 Interactively, if an argument is not given, make the window one line bigger.
 If HORIZONTAL is non-nil, enlarge horizontally instead of vertically.
-
-Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size
-of the siblings above or to the left of the selected window.  Only
-siblings to the right or below are changed.  */)
-     (arg, horizontal, preserve_before)
-     register Lisp_Object arg, horizontal, preserve_before;
+This function can delete windows, even the second window, if they get
+too small.  */)
+     (arg, horizontal)
+     Lisp_Object arg, horizontal;
 {
   CHECK_NUMBER (arg);
-  enlarge_window (selected_window, XINT (arg), !NILP (horizontal),
-                  !NILP (preserve_before));
+  enlarge_window (selected_window, XINT (arg), !NILP (horizontal));
 
   if (! NILP (Vwindow_configuration_change_hook))
     call1 (Vrun_hooks, Qwindow_configuration_change_hook);
@@ -3905,20 +3902,16 @@ siblings to the right or below are changed.  */)
   return Qnil;
 }
 
-DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 3, "p",
+DEFUN ("shrink-window", Fshrink_window, Sshrink_window, 1, 2, "p",
        doc: /* Make current window ARG lines smaller.
 From program, optional second arg non-nil means shrink sideways arg columns.
-Interactively, if an argument is not given, make the window one line smaller.
-
-Optional third arg PRESERVE-BEFORE, if non-nil, means do not change the size
-of the siblings above or to the left of the selected window.  Only
+Interactively, if an argument is not given, make the window one line smaller.  Only
 siblings to the right or below are changed.  */)
-     (arg, side, preserve_before)
-     register Lisp_Object arg, side, preserve_before;
+     (arg, side)
+     Lisp_Object arg, side;
 {
   CHECK_NUMBER (arg);
-  enlarge_window (selected_window, -XINT (arg), !NILP (side),
-                  !NILP (preserve_before));
+  enlarge_window (selected_window, -XINT (arg), !NILP (side));
 
   if (! NILP (Vwindow_configuration_change_hook))
     call1 (Vrun_hooks, Qwindow_configuration_change_hook);
@@ -3956,15 +3949,12 @@ window_width (window)
 
    Siblings of the selected window are resized to fulfill the size
    request.  If they become too small in the process, they will be
-   deleted.
-
-   If PRESERVE_BEFORE is nonzero, that means don't alter
-   the siblings to the left or above WINDOW.  */
+   deleted.  */
 
 static void
-enlarge_window (window, delta, horiz_flag, preserve_before)
+enlarge_window (window, delta, horiz_flag)
      Lisp_Object window;
-     int delta, horiz_flag, preserve_before;
+     int delta, horiz_flag;
 {
   Lisp_Object parent, next, prev;
   struct window *p;
@@ -4011,33 +4001,18 @@ enlarge_window (window, delta, horiz_flag, preserve_before)
 
     /* Compute the maximum size increment this window can have.  */
 
-    if (preserve_before)
-      {
-        if (!NILP (parent))
-          {
-            maxdelta = (*sizefun) (parent) - XINT (*sizep);
-            /* Subtract size of siblings before, since we can't take that.  */
-            maxdelta -= XINT (CURBEG (window)) - XINT (CURBEG (parent));
-          }
-        else
-          maxdelta = (!NILP (p->next) ? ((*sizefun) (p->next)
-                                         - window_min_size (XWINDOW (p->next),
-                                                            horiz_flag, 0, 0))
-                      : (delta = 0));
-      }
-    else
-      maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep)
-                  /* This is a main window followed by a minibuffer.  */
-                  : !NILP (p->next) ? ((*sizefun) (p->next)
-                                       - window_min_size (XWINDOW (p->next),
-                                                          horiz_flag, 0, 0))
-                  /* This is a minibuffer following a main window.  */
-                  : !NILP (p->prev) ? ((*sizefun) (p->prev)
-                                       - window_min_size (XWINDOW (p->prev),
-                                                          horiz_flag, 0, 0))
-                  /* This is a frame with only one window, a minibuffer-only
-                     or a minibufferless frame.  */
-                  : (delta = 0));
+    maxdelta = (!NILP (parent) ? (*sizefun) (parent) - XINT (*sizep)
+                /* This is a main window followed by a minibuffer.  */
+                : !NILP (p->next) ? ((*sizefun) (p->next)
+                                     - window_min_size (XWINDOW (p->next),
+                                                        horiz_flag, 0, 0))
+                /* This is a minibuffer following a main window.  */
+                : !NILP (p->prev) ? ((*sizefun) (p->prev)
+                                     - window_min_size (XWINDOW (p->prev),
+                                                        horiz_flag, 0, 0))
+                /* This is a frame with only one window, a minibuffer-only
+                   or a minibufferless frame.  */
+                : (delta = 0));
 
     if (delta > maxdelta)
       /* This case traps trying to make the minibuffer
@@ -4060,10 +4035,9 @@ enlarge_window (window, delta, horiz_flag, preserve_before)
   for (next = p->next; ! NILP (next); next = XWINDOW (next)->next)
     maximum += (*sizefun) (next) - window_min_size (XWINDOW (next),
                                                     horiz_flag, 0, 0);
-  if (! preserve_before)
-    for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev)
-      maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev),
-                                                      horiz_flag, 0, 0);
+  for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev)
+    maximum += (*sizefun) (prev) - window_min_size (XWINDOW (prev),
+                                                    horiz_flag, 0, 0);
 
   /* If we can get it all from them without deleting them, do so.  */
   if (delta <= maximum)
@@ -4079,7 +4053,7 @@ enlarge_window (window, delta, horiz_flag, preserve_before)
          moving away from this window in both directions alternately,
          and take as much as we can get without deleting that sibling.  */
       while (delta != 0
-             && (!NILP (next) || (!preserve_before && !NILP (prev))))
+             && (!NILP (next) || !NILP (prev)))
         {
           if (! NILP (next))
             {
@@ -4103,7 +4077,7 @@ enlarge_window (window, delta, horiz_flag, preserve_before)
           if (delta == 0)
             break;
 
-          if (!preserve_before && ! NILP (prev))
+          if (! NILP (prev))
             {
               int this_one = ((*sizefun) (prev)
                               - window_min_size (XWINDOW (prev),
@@ -4352,7 +4326,7 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
 DEFUN ("adjust-window-trailing-edge", Fadjust_window_trailing_edge,
        Sadjust_window_trailing_edge, 3, 3, 0,
        doc: /* Adjust the bottom or right edge of WINDOW by DELTA.
-If HORIZ_FLAG is t, that means adjust the width, moving the right edge.
+If HORIZONTAL is non-nil, that means adjust the width, moving the right edge.
 Otherwise, adjust the height, moving the bottom edge.
 
 Following siblings of the selected window are resized to fulfill
@@ -4604,7 +4578,7 @@ shrink_mini_window (w)
          among the other windows.  */
       Lisp_Object window;
       XSETWINDOW (window, w);
-      enlarge_window (window, 1 - XFASTINT (w->total_lines), 0, 0);
+      enlarge_window (window, 1 - XFASTINT (w->total_lines), 0);
     }
 }
 
@@ -5833,7 +5807,23 @@ the return value is nil.  Otherwise the value is t.  */)
   else
     {
       if (XBUFFER (new_current_buffer) == current_buffer)
-        old_point = PT;
+        /* The code further down "preserves point" by saving here PT in
+           old_point and then setting it later back into PT.  When the
+           current-selected-window and the final-selected-window both show
+           the current buffer, this suffers from the problem that the
+           current PT is the window-point of the current-selected-window,
+           while the final PT is the point of the final-selected-window, so
+           this copy from one PT to the other would end up moving the
+           window-point of the final-selected-window to the window-point of
+           the current-selected-window.  So we have to be careful which
+           point of the current-buffer we copy into old_point.  */
+        if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer)
+            && WINDOWP (selected_window)
+            && EQ (XWINDOW (selected_window)->buffer, new_current_buffer)
+            && !EQ (selected_window, data->current_window))
+          old_point = XMARKER (XWINDOW (data->current_window)->pointm)->charpos;
+        else
+          old_point = PT;
       else
         /* BUF_PT (XBUFFER (new_current_buffer)) gives us the position of
            point in new_current_buffer as of the last time this buffer was
diff --git a/src/xfns.c b/src/xfns.c
index 311bc5f1bd8..a03573f7bf3 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -619,7 +619,7 @@ x_real_positions (f, xptr, yptr)
 
   if (! had_errors)
     {
-      int ign;
+      unsigned int ign;
       Window child, rootw;
 
       /* Get the real coordinates for the WM window upper left corner */
@@ -805,9 +805,7 @@ xg_set_icon (f, file)
     {
       GdkPixbuf *pixbuf;
       GError *err = NULL;
-      char *filename;
-
-      filename = SDATA (found);
+      char *filename = (char *) SDATA (found);
       BLOCK_INPUT;
 
       pixbuf = gdk_pixbuf_new_from_file (filename, &err);
@@ -836,17 +834,12 @@ xg_set_icon_from_xpm_data (f, data)
     char **data;
 {
   int result = 0;
-  GError *err = NULL;
-  GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);
+  GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) data);
 
   if (!pixbuf)
-    {
-      g_error_free (err);
-      return 0;
-    }
+    return 0;
 
-  gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                       pixbuf);
+  gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), pixbuf);
   g_object_unref (pixbuf);
   return 1;
 }
@@ -1658,7 +1651,7 @@ x_set_name_internal (f, name)
 
 #ifdef USE_GTK
         gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                              SDATA (ENCODE_UTF_8 (name)));
+                              (char *) SDATA (ENCODE_UTF_8 (name)));
 #else /* not USE_GTK */
         XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
 #endif /* not USE_GTK */
@@ -3393,10 +3386,17 @@ This function is an internal primitive--use `make-frame' instead.  */)
                        FRAME_OUTER_WINDOW (f),
                        dpyinfo->Xatom_wm_client_leader,
                        XA_WINDOW, 32, PropModeReplace,
-                       (char *) &dpyinfo->client_leader_window, 1);
+                       (unsigned char *) &dpyinfo->client_leader_window, 1);
       UNBLOCK_INPUT;
     }
 
+  /* Initialize `default-minibuffer-frame' in case this is the first
+     frame on this display device.  */
+  if (FRAME_HAS_MINIBUF_P (f)
+      && (!FRAMEP (kb->Vdefault_minibuffer_frame)
+          || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))))
+    kb->Vdefault_minibuffer_frame = frame;
+
   UNGCPRO;
 
   /* Make sure windows on this frame appear in calls to next-window
@@ -4944,6 +4944,9 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
     *root_y = XINT (top);
   else if (*root_y + XINT (dy) - height < 0)
     *root_y -= XINT (dy);
+  else if (*root_y + XINT (dy) >= FRAME_X_DISPLAY_INFO (f)->height)
+    /* Put tip above the pointer.  */
+    *root_y -= XINT (dy);
   else
     {
       *root_y -= height;
diff --git a/src/xterm.h b/src/xterm.h
index 3a8c3d79d61..c96d015be4a 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1036,6 +1036,7 @@ extern int have_menus_p P_ ((void));
 
 #ifdef USE_GTK
 extern int xg_set_icon P_ ((struct frame *, Lisp_Object));
+extern int xg_set_icon_from_xpm_data P_ ((struct frame *, char**));
 #endif /* USE_GTK */
 
 extern void x_real_positions P_ ((struct frame *, int *, int *));