Merged in changes from CVS trunk.

Patches applied:

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

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


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

2 files changed, 31 insertions, 31 deletions

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 5163471f47a..8446266b2f3 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -75,21 +75,32 @@ pops up the GUD buffer unless `gdb-show-main' is t. In this case
 it starts with two windows: one displaying the GUD buffer and the
 other with the source file with the main routine of the debugee.
 
-If `gdb-many-windows' is t the layout below will appear
-regardless of the value of `gdb-show-main' unless
+If `gdb-many-windows' is t, regardless of the value of
+`gdb-show-main', the layout below will appear unless
 `gdb-use-inferior-io-buffer' is nil when the source buffer
 occupies the full width of the frame. Keybindings are given in
 relevant buffer.
 
+Watch expressions appear in the speedbar/slowbar.
+
+The following interactive lisp functions help control operation :
+
+`gdb-many-windows'    - Toggle the number of windows gdb uses.
+`gdb-restore-windows' - To restore the window layout.
+
+See Info node `(emacs)GDB Graphical Interface' for a more
+detailed description of this mode.
+
+
 ---------------------------------------------------------------------
                                GDB Toolbar
 ---------------------------------------------------------------------
-GUD buffer (I/O of GDB)           | Locals buffer
+ GUD buffer (I/O of GDB)          | Locals buffer
                                   |
                                   |
                                   |
 ---------------------------------------------------------------------
-Source buffer                     | Input/Output (of debugee) buffer
+ Source buffer                    | Input/Output (of debugee) buffer
                                   | (comint-mode)
                                   |
                                   |
@@ -98,28 +109,12 @@ Source buffer                     | Input/Output (of debugee) buffer
                                   |
                                   |
 ---------------------------------------------------------------------
-Stack buffer                      | Breakpoints buffer
+ Stack buffer                     | Breakpoints buffer
  RET      gdb-frames-select       | SPC    gdb-toggle-breakpoint
                                   | RET    gdb-goto-breakpoint
                                   |   d    gdb-delete-breakpoint
 ---------------------------------------------------------------------
-
-All the buffers share the toolbar and source should always display in the same
-window e.g after typing g on a breakpoint in the breakpoints buffer. Breakpoint
-icons are displayed both by setting a break with gud-break and by typing break
-in the GUD buffer.
-
-This works best (depending on the size of your monitor) using most of the
-screen.
-
-Displayed expressions appear in separate frames. Arrays may be displayed
-as slices and visualised using the graph program from plotutils if installed.
-Pointers in structures may be followed in a tree-like fashion.
-
-The following interactive lisp functions help control operation :
-
-`gdb-many-windows'    - Toggle the number of windows gdb uses.
-`gdb-restore-windows' - To restore the window layout."
+"
   ;;
   (interactive (list (gud-query-cmdline 'gdba)))
   ;;
@@ -224,6 +219,11 @@ speedbar."
              `(lambda () (gdb-var-create-handler ,expr))))))
   (select-window (get-buffer-window gud-comint-buffer)))
 
+(defun gdb-goto-info ()
+  (interactive)
+  (select-frame (make-frame))
+  (Info-goto-node "(emacs)GDB Graphical Interface"))
+
 (defconst gdb-var-create-regexp
 "name=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
 
@@ -1656,7 +1656,7 @@ the source buffer."
   (other-window 1))
 
 (defcustom gdb-many-windows nil
-  "Nil (the default value) means just pops up the GUD buffer
+  "Nil (the default value) means just pop up the GUD buffer
 unless `gdb-show-main' is t. In this case it starts with two
 windows: one displaying the GUD buffer and the other with the
 source file with the main routine of the debugee. Non-nil means
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index a34b0bb2d48..4627f2ac639 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -92,7 +92,9 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
 Used to grey out relevant toolbar icons.")
 
 (easy-mmode-defmap gud-menu-map
-  '(([refresh]  "Refresh" . gud-refresh)
+  '(([help]     menu-item "Help" gdb-goto-info
+                     :enable (eq gud-minor-mode 'gdba))
+    ([refresh]  "Refresh" . gud-refresh)
     ([run]      menu-item "Run" gud-run
                      :enable (and (not gud-running)
                                   (memq gud-minor-mode '(gdba gdb dbx jdb))))
@@ -116,20 +118,17 @@ Used to grey out relevant toolbar icons.")
     ([print]    menu-item "Print Expression" gud-print
                      :enable (not gud-running))
     ([watch]    menu-item "Watch Expression" gud-watch
-                     :enable (and (not gud-running)
-                                  (eq gud-minor-mode 'gdba)))
+                     :enable (and (not gud-running) (eq gud-minor-mode 'gdba)))
     ([finish]   menu-item "Finish Function" gud-finish
                      :enable (and (not gud-running)
                                   (memq gud-minor-mode
                                         '(gdba gdb xdb jdb pdb bashdb))))
     ([stepi]    menu-item "Step Instruction" gud-stepi
                      :enable (and (not gud-running)
-                                  (memq gud-minor-mode
-                                        '(gdba gdb dbx))))
+                                  (memq gud-minor-mode '(gdba gdb dbx))))
     ([nexti]    menu-item "Next Instruction" gud-nexti
                      :enable (and (not gud-running)
-                                  (memq gud-minor-mode
-                                        '(gdba gdb dbx))))
+                                  (memq gud-minor-mode '(gdba gdb dbx))))
     ([step]     menu-item "Step Line" gud-step
                      :enable (not gud-running))
     ([next]     menu-item "Next Line" gud-next
@@ -171,7 +170,8 @@ Used to grey out relevant toolbar icons.")
                      (gud-stepi . "gud-si")
                      (gud-nexti . "gud-ni")
                      (gud-up . "gud-up")
-                     (gud-down . "gud-down"))
+                     (gud-down . "gud-down")
+                     (gdb-goto-info . "help"))
                    map)
           (tool-bar-local-item-from-menu
            (car x) (cdr x) map gud-minor-mode-map)))))