Merged from miles@gnu.org--gnu-2005 (patch 119)

Patches applied:

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

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

4 files changed, 33 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c926e9b919..4cd7ef4f373 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2005-02-21  Stefan  <monnier@iro.umontreal.ca>
+
+        * keymap.h: Declare Fcurrent_active_maps, used in doc.c.
+
+2005-02-21  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_vertically_backward): Eliminate two xasserts.
+        I think those asserts are bogus if buffer contains invisible text
+        or images.
+
+2005-02-21  David Kastrup <dak@gnu.org>
+
+        * gtkutil.c (xg_create_frame_widgets): UNBLOCK_INPUT on error.
+
 2005-02-20  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (pos_visible_p): Be sure to move to the specified
@@ -848,13 +862,8 @@
         (install_window_handler) [TARGET_API_MAC_CARBON]:
         Register handlers for tracking/receiving drag-and-drop items.
         (do_ae_open_documents): Generate unibyte strings for filenames.
-<<<<<<< ChangeLog
-        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
-        Reject only non-filename items.  Set event modifiers and return value.
-=======
         (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
         Reject only non-filename items.  Set event modifiers, and return value.
->>>>>>> 1.4187
 
 2004-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -964,12 +973,7 @@
         (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
         if the position is neither user-specified nor program-specified.
         (x_free_frame_resources): Free size_hints.
-<<<<<<< ChangeLog
-        (x_wm_set_size_hint): Allocate size_hints if needed.
-        Set size_hints.
-=======
         (x_wm_set_size_hint): Allocate size_hints if needed.  Set size_hints.
->>>>>>> 1.4187
         (mac_clear_font_name_table): New function.
         (mac_do_list_fonts): Initialize font_name_table if needed.
         (x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
@@ -1021,11 +1025,7 @@
 
 2004-12-27  Richard M. Stallman  <rms@gnu.org>
 
-<<<<<<< ChangeLog
-        * buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el).
-=======
         * buffer.c (Fbuffer_disable_undo): Delete (move to simple.el).
->>>>>>> 1.4187
         (syms_of_buffer): Don't defsubr it.
 
         * process.c (list_processes_1): Set undo_list instead
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6bf0c25f350..c291b44f5a2 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -584,14 +584,14 @@ xg_resize_widgets (f, pixelwidth, pixelheight)
 {
   int mbheight = FRAME_MENUBAR_HEIGHT (f);
   int tbheight = FRAME_TOOLBAR_HEIGHT (f);
-  int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight 
+  int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight
                                                    - mbheight - tbheight));
   int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
 
   if (FRAME_GTK_WIDGET (f)
-      && (columns != FRAME_COLS (f) 
+      && (columns != FRAME_COLS (f)
           || rows != FRAME_LINES (f)
-          || pixelwidth != FRAME_PIXEL_WIDTH (f) 
+          || pixelwidth != FRAME_PIXEL_WIDTH (f)
           || pixelheight != FRAME_PIXEL_HEIGHT (f)))
     {
       struct x_output *x = f->output_data.x;
@@ -719,6 +719,7 @@ xg_create_frame_widgets (f)
       if (wvbox) gtk_widget_destroy (wvbox);
       if (wfixed) gtk_widget_destroy (wfixed);
 
+      UNBLOCK_INPUT;
       return 0;
     }
 
@@ -2881,7 +2882,7 @@ scroll_bar_button_cb (widget, event, user_data)
       if (xg_timer) xg_stop_timer ();
       bar->dragging = Qnil;
     }
-  
+
   return FALSE;
 }
 
@@ -2945,7 +2946,7 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name)
      event box window.  */
   gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), webox, -1, -1);
   gtk_container_add (GTK_CONTAINER (webox), wscroll);
-  
+
 
   /* Set the cursor to an arrow.  */
   xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
@@ -3270,10 +3271,10 @@ xg_tool_bar_item_expose_callback (w, event, client_data)
 
   event->area.x = max (0, event->area.x);
   event->area.y = max (0, event->area.y);
-  
+
   event->area.width = max (width, event->area.width);
   event->area.height = max (height, event->area.height);
-  
+
   return FALSE;
 }
 
@@ -3394,7 +3395,7 @@ update_frame_tool_bar (f)
      DEFAULT_TOOL_BAR_BUTTON_MARGIN has no effect.  */
   hmargin = max (0, hmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
   vmargin = max (0, vmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN);
-  
+
   if (! x->toolbar_widget)
     xg_create_tool_bar (f);
 
diff --git a/src/keymap.h b/src/keymap.h
index e50a62c8aa5..bec39186863 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -1,5 +1,5 @@
 /* Functions to manipulate keymaps.
-   Copyright (C) 2001  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -33,6 +33,7 @@ EXFUN (Fkey_binding, 3);
 EXFUN (Fkey_description, 2);
 EXFUN (Fsingle_key_description, 2);
 EXFUN (Fwhere_is_internal, 5);
+EXFUN (Fcurrent_active_maps, 1);
 extern Lisp_Object access_keymap P_ ((Lisp_Object, Lisp_Object, int, int, int));
 extern Lisp_Object get_keyelt P_ ((Lisp_Object, int));
 extern Lisp_Object get_keymap P_ ((Lisp_Object, int, int));
diff --git a/src/xdisp.c b/src/xdisp.c
index f8f97b44b3b..c05e57cf7e1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6314,7 +6314,11 @@ move_it_vertically_backward (it, dy)
          value of nlines is > 0 if continuation lines were involved.  */
       if (nlines > 0)
         move_it_by_lines (it, nlines, 1);
+#if 0
+      /* I think this assert is bogus if buffer contains
+         invisible text or images.  KFS.  */
       xassert (IT_CHARPOS (*it) <= start_pos);
+#endif
     }
   else
     {
@@ -6363,7 +6367,11 @@ move_it_vertically_backward (it, dy)
               while (target_y >= line_bottom_y (it) && IT_CHARPOS (*it) < ZV);
             }
 
+#if 0
+          /* I think this assert is bogus if buffer contains
+             invisible text or images.  KFS.  */
           xassert (IT_CHARPOS (*it) >= BEGV);
+#endif
         }
     }
 }