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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 66-84)

   - Update from CVS
   - rcirc: Add flexible response formatting; Add nick abbrevs
   - Merge from gnus--rel--5.10
   - Update from CVS: man/dired.texi (Tumme): More tumme documentation.
   - Merge from erc--emacs--0
   - Make ERC comply with the new copyright year guidelines.
   - (rcirc-format-response-string): Fix small bugs
   - Fix compiler error in erc-dcc.el.

 * gnus--rel--5.10  (patch 29)

   - Add sendmail.el and smptmail.el from Emacs tree to contrib/

6 files changed, 68 insertions, 7 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 3f5565aee40..408e2ab8b9b 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -548,7 +548,16 @@ end
 define xwindow
   xgetptr $
   print (struct window *) $ptr
-  printf "%dx%d+%d+%d\n", $->width, $->height, $->left, $->top
+  set $window = (struct window *) $ptr
+  xgetint $window->total_cols
+  set $width=$int
+  xgetint $window->total_lines
+  set $height=$int
+  xgetint $window->left_col
+  set $left=$int
+  xgetint $window->top_line
+  set $top=$int
+  printf "%dx%d+%d+%d\n", $width, $height, $left, $top
 end
 document xwindow
 Print $ as a window pointer, assuming it is an Emacs Lisp window value.
diff --git a/src/ChangeLog b/src/ChangeLog
index 0f1dded77c7..12b0ff5b505 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2006-02-13  Richard M. Stallman  <rms@gnu.org>
+
+        * .gdbinit (xwindow): Update the code to show the window box.
+
+2006-02-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (note_mouse_movement): Check for NULL FRAME_X_OUTPUT (frame).
+
+2006-02-12  Richard M. Stallman  <rms@gnu.org>
+
+        * cmds.c (internal_self_insert): Handle weird auto-fill-function.
+
+2006-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (Venable_disabled_menus_and_buttons): New variable.
+        (syms_of_keyboard): DEVFAR_LISP and initialize it.
+        (parse_tool_bar_item, parse_menu_item): If that variable is
+        non-nil, don't disable menu items and tool-bar buttons.
+
+2006-02-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * doc.c (Fsubstitute_command_keys): Doc fix.
+
 2006-02-10  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * data.c (Findirect_function): Rewrite docstring.
diff --git a/src/cmds.c b/src/cmds.c
index e035ef7fd68..72d35b8cefd 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -536,7 +536,8 @@ internal_self_insert (c, noautofill)
            justification, if any, know where the end is going to be.  */
         SET_PT_BOTH (PT - 1, PT_BYTE - 1);
       tem = call0 (current_buffer->auto_fill_function);
-      if (c == '\n')
+      /* Test PT < ZV in case the auto-fill-function is strange.  */
+      if (c == '\n' && PT < ZV)
         SET_PT_BOTH (PT + 1, PT_BYTE + 1);
       if (!NILP (tem))
         hairy = 2;
diff --git a/src/doc.c b/src/doc.c
index 19c03a7a71d..a69c3cf4382 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -739,7 +739,7 @@ Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke
 sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not
 on any keys.
 Substrings of the form \\=\\{MAPVAR} are replaced by summaries
-\(made by describe-bindings) of the value of MAPVAR, taken as a keymap.
+\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap.
 Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
 as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
diff --git a/src/keyboard.c b/src/keyboard.c
index 2081db6ae9d..84532871be5 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -649,6 +649,11 @@ static EMACS_TIME timer_idleness_start_time;
 
 static EMACS_TIME timer_last_idleness_start_time;
 
+/* If non-nil, events produced by disabled menu items and tool-bar
+   buttons are not ignored.  Help functions bind this to allow help on
+   those items and buttons.  */
+Lisp_Object Venable_disabled_menus_and_buttons;
+
 
 /* Global variable declarations.  */
 
@@ -7270,7 +7275,9 @@ parse_menu_item (item, notreal, inmenubar)
       if (SYMBOLP (item))
         {
           tem = Fget (item, Qmenu_enable);
-          if (!NILP (tem))
+          if (!NILP (Venable_disabled_menus_and_buttons))
+            AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt;
+          else if (!NILP (tem))
             AREF (item_properties, ITEM_PROPERTY_ENABLE) = tem;
         }
     }
@@ -7299,7 +7306,12 @@ parse_menu_item (item, notreal, inmenubar)
               item = XCDR (item);
 
               if (EQ (tem, QCenable))
-                AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item);
+                {
+                  if (!NILP (Venable_disabled_menus_and_buttons))
+                    AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt;
+                  else
+                    AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item);
+                }
               else if (EQ (tem, QCvisible) && !notreal)
                 {
                   /* If got a visible property and that evaluates to nil
@@ -7819,8 +7831,13 @@ parse_tool_bar_item (key, item)
       value = XCAR (XCDR (item));
 
       if (EQ (key, QCenable))
-        /* `:enable FORM'.  */
-        PROP (TOOL_BAR_ITEM_ENABLED_P) = value;
+        {
+          /* `:enable FORM'.  */
+          if (!NILP (Venable_disabled_menus_and_buttons))
+            PROP (TOOL_BAR_ITEM_ENABLED_P) = Qt;
+          else
+            PROP (TOOL_BAR_ITEM_ENABLED_P) = value;
+        }
       else if (EQ (key, QCvisible))
         {
           /* `:visible FORM'.  If got a visible property and that
@@ -11469,6 +11486,14 @@ If the value is not a number, such messages don't time out.  */);
 The value of that variable is passed to `quit-flag' and later causes a
 peculiar kind of quitting.  */);
   Vthrow_on_input = Qnil;
+
+  DEFVAR_LISP ("enable-disabled-menus-and-buttons",
+               &Venable_disabled_menus_and_buttons,
+               doc: /* If non-nil, don't ignore events produced by disabled menu items and tool-bar.
+
+Help functions bind this to allow help on disabled menu items
+and tool-bar buttons.  */);
+  Venable_disabled_menus_and_buttons = Qnil;
 }
 
 void
diff --git a/src/xterm.c b/src/xterm.c
index 2eb92e8a532..1d67ab51f01 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3598,6 +3598,9 @@ note_mouse_movement (frame, event)
   last_mouse_motion_event = *event;
   XSETFRAME (last_mouse_motion_frame, frame);
 
+  if (!FRAME_X_OUTPUT (frame))
+    return 0;
+
   if (event->window != FRAME_X_WINDOW (frame))
     {
       frame->mouse_moved = 1;