aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-02-18 00:48:36 +0000
committerJuanma Barranquero2008-02-18 00:48:36 +0000
commitbce8498677bd5df75fd96029472cc95ebcb84233 (patch)
tree1db1afdee7c702ced34ffff02b68dfd1b6bde50f
parent407c97dd38ff4f70724bcb225027304f7fc21cfc (diff)
downloademacs-bce8498677bd5df75fd96029472cc95ebcb84233.tar.gz
emacs-bce8498677bd5df75fd96029472cc95ebcb84233.zip
(gud-def, gud-last-speedbar-stackframe): Doc fixes.
(gud-symbol, gud-expansion-speedbar-buttons, gud-speedbar-buttons, gud-gdb-run-command-fetch-lines, gud-dbx-use-stopformat-p, gud-jdb-classpath, gud-jdb-find-source-using-classpath, jdb, gud-find-class, gdb-script-mode, gud-tooltip-event, gud-tooltip-tips): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/progmodes/gud.el62
2 files changed, 40 insertions, 31 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c418f49f97..3820ff6cdd7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12008-02-18 Juanma Barranquero <lekktu@gmail.com>
2
3 * progmodes/gud.el (gud-def, gud-last-speedbar-stackframe): Doc fixes.
4 (gud-symbol, gud-expansion-speedbar-buttons, gud-speedbar-buttons)
5 (gud-gdb-run-command-fetch-lines, gud-dbx-use-stopformat-p)
6 (gud-jdb-classpath, gud-jdb-find-source-using-classpath, jdb)
7 (gud-find-class, gdb-script-mode, gud-tooltip-event, gud-tooltip-tips):
8 Fix typos in docstrings.
9
12008-02-17 Stefan Monnier <monnier@iro.umontreal.ca> 102008-02-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 11
3 * progmodes/ada-mode.el (ada-font-lock-syntactic-keywords): 12 * progmodes/ada-mode.el (ada-font-lock-syntactic-keywords):
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 714e06c3a18..e653e3cd81f 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -58,7 +58,7 @@
58 58
59(defgroup gud nil 59(defgroup gud nil
60 "Grand Unified Debugger mode for gdb and other debuggers under Emacs. 60 "Grand Unified Debugger mode for gdb and other debuggers under Emacs.
61Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python), jdb." 61Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python) and jdb."
62 :group 'unix 62 :group 'unix
63 :group 'tools) 63 :group 'tools)
64 64
@@ -88,7 +88,7 @@ Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python), jdb."
88 88
89(defun gud-symbol (sym &optional soft minor-mode) 89(defun gud-symbol (sym &optional soft minor-mode)
90 "Return the symbol used for SYM in MINOR-MODE. 90 "Return the symbol used for SYM in MINOR-MODE.
91MINOR-MODE defaults to `gud-minor-mode. 91MINOR-MODE defaults to `gud-minor-mode'.
92The symbol returned is `gud-<MINOR-MODE>-<SYM>'. 92The symbol returned is `gud-<MINOR-MODE>-<SYM>'.
93If SOFT is non-nil, returns nil if the symbol doesn't already exist." 93If SOFT is non-nil, returns nil if the symbol doesn't already exist."
94 (unless (or minor-mode gud-minor-mode) (error "Gud internal error")) 94 (unless (or minor-mode gud-minor-mode) (error "Gud internal error"))
@@ -333,14 +333,14 @@ Uses `gud-<MINOR-MODE>-directories' to find the source files."
333;; Of course you may use `gud-def' with any other debugger command, including 333;; Of course you may use `gud-def' with any other debugger command, including
334;; user defined ones. 334;; user defined ones.
335 335
336;; A macro call like (gud-def FUNC NAME KEY DOC) expands to a form 336;; A macro call like (gud-def FUNC CMD KEY DOC) expands to a form
337;; which defines FUNC to send the command NAME to the debugger, gives 337;; which defines FUNC to send the command CMD to the debugger, gives
338;; it the docstring DOC, and binds that function to KEY in the GUD 338;; it the docstring DOC, and binds that function to KEY in the GUD
339;; major mode. The function is also bound in the global keymap with the 339;; major mode. The function is also bound in the global keymap with the
340;; GUD prefix. 340;; GUD prefix.
341 341
342(defmacro gud-def (func cmd key &optional doc) 342(defmacro gud-def (func cmd key &optional doc)
343 "Define FUNC to be a command sending STR and bound to KEY, with 343 "Define FUNC to be a command sending CMD and bound to KEY, with
344optional doc string DOC. Certain %-escapes in the string arguments 344optional doc string DOC. Certain %-escapes in the string arguments
345are interpreted specially if present. These are: 345are interpreted specially if present. These are:
346 346
@@ -412,7 +412,7 @@ we're in the GUD buffer)."
412 412
413(defvar gud-last-speedbar-stackframe nil 413(defvar gud-last-speedbar-stackframe nil
414 "Description of the currently displayed GUD stack. 414 "Description of the currently displayed GUD stack.
415t means that there is no stack, and we are in display-file mode.") 415The value t means that there is no stack, and we are in display-file mode.")
416 416
417(defvar gud-speedbar-key-map nil 417(defvar gud-speedbar-key-map nil
418 "Keymap used when in the buffers display mode.") 418 "Keymap used when in the buffers display mode.")
@@ -474,14 +474,14 @@ t means that there is no stack, and we are in display-file mode.")
474 (add-hook 'speedbar-load-hook 'gud-install-speedbar-variables)) 474 (add-hook 'speedbar-load-hook 'gud-install-speedbar-variables))
475 475
476(defun gud-expansion-speedbar-buttons (directory zero) 476(defun gud-expansion-speedbar-buttons (directory zero)
477 "Wrapper for call to speedbar-add-expansion-list. DIRECTORY and 477 "Wrapper for call to `speedbar-add-expansion-list'.
478ZERO are not used, but are required by the caller." 478DIRECTORY and ZERO are not used, but are required by the caller."
479 (gud-speedbar-buttons gud-comint-buffer)) 479 (gud-speedbar-buttons gud-comint-buffer))
480 480
481(defun gud-speedbar-buttons (buffer) 481(defun gud-speedbar-buttons (buffer)
482 "Create a speedbar display based on the current state of GUD. 482 "Create a speedbar display based on the current state of GUD.
483If the GUD BUFFER is not running a supported debugger, then turn 483If the GUD BUFFER is not running a supported debugger, then turn
484off the specialized speedbar mode. BUFFER is not used, but are 484off the specialized speedbar mode. BUFFER is not used, but is
485required by the caller." 485required by the caller."
486 (when (and gud-comint-buffer 486 (when (and gud-comint-buffer
487 ;; gud-comint-buffer might be killed 487 ;; gud-comint-buffer might be killed
@@ -904,7 +904,7 @@ It is passed through FILTER before we look at it."
904(defun gud-gdb-run-command-fetch-lines (command buffer &optional skip) 904(defun gud-gdb-run-command-fetch-lines (command buffer &optional skip)
905 "Run COMMAND, and return the list of lines it outputs. 905 "Run COMMAND, and return the list of lines it outputs.
906BUFFER is the current buffer which may be the GUD buffer in which to run. 906BUFFER is the current buffer which may be the GUD buffer in which to run.
907SKIP is the number of chars to skip on each lines, it defaults to 0." 907SKIP is the number of chars to skip on each line, it defaults to 0."
908 (with-current-buffer gud-comint-buffer 908 (with-current-buffer gud-comint-buffer
909 (if (and (eq gud-comint-buffer buffer) 909 (if (and (eq gud-comint-buffer buffer)
910 (save-excursion 910 (save-excursion
@@ -1157,8 +1157,8 @@ a better solution in 6.1 upwards.")
1157(defvar gud-dbx-use-stopformat-p 1157(defvar gud-dbx-use-stopformat-p
1158 (string-match "irix[6-9]\\.[1-9]" system-configuration) 1158 (string-match "irix[6-9]\\.[1-9]" system-configuration)
1159 "Non-nil to use the dbx feature present at least from Irix 6.1 1159 "Non-nil to use the dbx feature present at least from Irix 6.1
1160 whereby $stopformat=1 produces an output format compatiable with 1160whereby $stopformat=1 produces an output format compatible with
1161 `gud-dbx-marker-filter'.") 1161`gud-dbx-marker-filter'.")
1162;; [Irix dbx seems to be a moving target. The dbx output changed 1162;; [Irix dbx seems to be a moving target. The dbx output changed
1163;; subtly sometime between OS v4.0.5 and v5.2 so that, for instance, 1163;; subtly sometime between OS v4.0.5 and v5.2 so that, for instance,
1164;; the output from `up' is no longer spotted by gud (and it's probably 1164;; the output from `up' is no longer spotted by gud (and it's probably
@@ -1757,7 +1757,7 @@ class information on jdb startup (original method)."
1757 :group 'gud) 1757 :group 'gud)
1758 1758
1759(defvar gud-jdb-classpath nil 1759(defvar gud-jdb-classpath nil
1760 "Java/jdb classpath directories list. 1760 "Java/jdb classpath directories list.
1761If `gud-jdb-use-classpath' is non-nil, gud-jdb derives the `gud-jdb-classpath' 1761If `gud-jdb-use-classpath' is non-nil, gud-jdb derives the `gud-jdb-classpath'
1762list automatically using the following methods in sequence 1762list automatically using the following methods in sequence
1763\(with subsequent successful steps overriding the results of previous 1763\(with subsequent successful steps overriding the results of previous
@@ -1766,7 +1766,7 @@ steps):
17661) Read the CLASSPATH environment variable, 17661) Read the CLASSPATH environment variable,
17672) Read any \"-classpath\" argument used to run jdb, 17672) Read any \"-classpath\" argument used to run jdb,
1768 or detected in jdb output (e.g. if jdb is run by a script 1768 or detected in jdb output (e.g. if jdb is run by a script
1769 that echoes the actual jdb command before starting jdb) 1769 that echoes the actual jdb command before starting jdb),
17703) Send a \"classpath\" command to jdb and scan jdb output for 17703) Send a \"classpath\" command to jdb and scan jdb output for
1771 classpath information if jdb is invoked with an \"-attach\" (to 1771 classpath information if jdb is invoked with an \"-attach\" (to
1772 an already running VM) argument (This case typically does not 1772 an already running VM) argument (This case typically does not
@@ -1774,7 +1774,7 @@ steps):
1774 to the VM when it is started). 1774 to the VM when it is started).
1775 1775
1776Note that method 3 cannot be used with oldjdb (or Java 1 jdb) since 1776Note that method 3 cannot be used with oldjdb (or Java 1 jdb) since
1777those debuggers do not support the classpath command. Use 1) or 2).") 1777those debuggers do not support the classpath command. Use 1) or 2).")
1778 1778
1779(defvar gud-jdb-sourcepath nil 1779(defvar gud-jdb-sourcepath nil
1780 "Directory list provided by an (optional) \"-sourcepath\" option to jdb. 1780 "Directory list provided by an (optional) \"-sourcepath\" option to jdb.
@@ -1788,7 +1788,7 @@ the most recent debugger output history while searching for
1788source file information.") 1788source file information.")
1789 1789
1790(defvar gud-jdb-history nil 1790(defvar gud-jdb-history nil
1791"History of argument lists passed to jdb.") 1791 "History of argument lists passed to jdb.")
1792 1792
1793 1793
1794;; List of Java source file directories. 1794;; List of Java source file directories.
@@ -1805,21 +1805,21 @@ file from which the class originated. This allows gud mode to keep
1805the source code display in sync with the debugging session.") 1805the source code display in sync with the debugging session.")
1806 1806
1807(defvar gud-jdb-source-files nil 1807(defvar gud-jdb-source-files nil
1808"List of the java source files for this debugging session.") 1808 "List of the java source files for this debugging session.")
1809 1809
1810;; Association list of fully qualified class names (package + class name) 1810;; Association list of fully qualified class names (package + class name)
1811;; and their source files. 1811;; and their source files.
1812(defvar gud-jdb-class-source-alist nil 1812(defvar gud-jdb-class-source-alist nil
1813"Association list of fully qualified class names and source files.") 1813 "Association list of fully qualified class names and source files.")
1814 1814
1815;; This is used to hold a source file during analysis. 1815;; This is used to hold a source file during analysis.
1816(defvar gud-jdb-analysis-buffer nil) 1816(defvar gud-jdb-analysis-buffer nil)
1817 1817
1818(defvar gud-jdb-classpath-string nil 1818(defvar gud-jdb-classpath-string nil
1819"Holds temporary classpath values.") 1819 "Holds temporary classpath values.")
1820 1820
1821(defun gud-jdb-build-source-files-list (path extn) 1821(defun gud-jdb-build-source-files-list (path extn)
1822"Return a list of java source files (absolute paths). 1822 "Return a list of java source files (absolute paths).
1823PATH gives the directories in which to search for files with 1823PATH gives the directories in which to search for files with
1824extension EXTN. Normally EXTN is given as the regular expression 1824extension EXTN. Normally EXTN is given as the regular expression
1825 \"\\.java$\" ." 1825 \"\\.java$\" ."
@@ -2089,8 +2089,8 @@ extension EXTN. Normally EXTN is given as the regular expression
2089(defvar gud-jdb-lowest-stack-level 999) 2089(defvar gud-jdb-lowest-stack-level 999)
2090 2090
2091(defun gud-jdb-find-source-using-classpath (p) 2091(defun gud-jdb-find-source-using-classpath (p)
2092"Find source file corresponding to fully qualified class p. 2092 "Find source file corresponding to fully qualified class P.
2093Convert p from jdb's output, converted to a pathname 2093Convert P from jdb's output, converted to a pathname
2094relative to a classpath directory." 2094relative to a classpath directory."
2095 (save-match-data 2095 (save-match-data
2096 (let 2096 (let
@@ -2118,14 +2118,14 @@ relative to a classpath directory."
2118 (if found-file (concat (car cplist) "/" filename))))) 2118 (if found-file (concat (car cplist) "/" filename)))))
2119 2119
2120(defun gud-jdb-find-source (string) 2120(defun gud-jdb-find-source (string)
2121"Alias for function used to locate source files. 2121 "Alias for function used to locate source files.
2122Set to `gud-jdb-find-source-using-classpath' or `gud-jdb-find-source-file' 2122Set to `gud-jdb-find-source-using-classpath' or `gud-jdb-find-source-file'
2123during jdb initialization depending on the value of 2123during jdb initialization depending on the value of
2124`gud-jdb-use-classpath'." 2124`gud-jdb-use-classpath'."
2125nil) 2125 nil)
2126 2126
2127(defun gud-jdb-parse-classpath-string (string) 2127(defun gud-jdb-parse-classpath-string (string)
2128"Parse the classpath list and convert each item to an absolute pathname." 2128 "Parse the classpath list and convert each item to an absolute pathname."
2129 (mapcar (lambda (s) (if (string-match "[/\\]$" s) 2129 (mapcar (lambda (s) (if (string-match "[/\\]$" s)
2130 (replace-match "" nil nil s) s)) 2130 (replace-match "" nil nil s) s))
2131 (mapcar 'file-truename 2131 (mapcar 'file-truename
@@ -2252,7 +2252,7 @@ The buffer is named \"*gud*\" if no initial class is given or
2252switch is given, omit all whitespace between it and its value. 2252switch is given, omit all whitespace between it and its value.
2253 2253
2254See `gud-jdb-use-classpath' and `gud-jdb-classpath' documentation for 2254See `gud-jdb-use-classpath' and `gud-jdb-classpath' documentation for
2255information on how jdb accesses source files. Alternatively (if 2255information on how jdb accesses source files. Alternatively (if
2256`gud-jdb-use-classpath' is nil), see `gud-jdb-directories' for the 2256`gud-jdb-use-classpath' is nil), see `gud-jdb-directories' for the
2257original source file access method. 2257original source file access method.
2258 2258
@@ -2996,7 +2996,7 @@ Link exprs of the form:
2996 "Find fully qualified class in file F at line LINE. 2996 "Find fully qualified class in file F at line LINE.
2997This function uses the `gud-jdb-classpath' (and optional 2997This function uses the `gud-jdb-classpath' (and optional
2998`gud-jdb-sourcepath') list(s) to derive a file 2998`gud-jdb-sourcepath') list(s) to derive a file
2999pathname relative to its classpath directory. The values in 2999pathname relative to its classpath directory. The values in
3000`gud-jdb-classpath' are assumed to have been converted to absolute 3000`gud-jdb-classpath' are assumed to have been converted to absolute
3001pathname standards using file-truename. 3001pathname standards using file-truename.
3002If F is visited by a buffer and its mode is CC-mode(Java), 3002If F is visited by a buffer and its mode is CC-mode(Java),
@@ -3194,7 +3194,7 @@ Treats actions as defuns."
3194 3194
3195;;;###autoload 3195;;;###autoload
3196(define-derived-mode gdb-script-mode nil "GDB-Script" 3196(define-derived-mode gdb-script-mode nil "GDB-Script"
3197 "Major mode for editing GDB scripts" 3197 "Major mode for editing GDB scripts."
3198 (set (make-local-variable 'comment-start) "#") 3198 (set (make-local-variable 'comment-start) "#")
3199 (set (make-local-variable 'comment-start-skip) "#+\\s-*") 3199 (set (make-local-variable 'comment-start-skip) "#+\\s-*")
3200 (set (make-local-variable 'outline-regexp) "[ \t]") 3200 (set (make-local-variable 'outline-regexp) "[ \t]")
@@ -3341,7 +3341,7 @@ For C this would dereference a pointer expression.")
3341 3341
3342(defvar gud-tooltip-event nil 3342(defvar gud-tooltip-event nil
3343 "The mouse movement event that led to a tooltip display. 3343 "The mouse movement event that led to a tooltip display.
3344This event can be examined by forms in GUD-TOOLTIP-DISPLAY.") 3344This event can be examined by forms in `gud-tooltip-display'.")
3345 3345
3346(defun gud-tooltip-dereference (&optional arg) 3346(defun gud-tooltip-dereference (&optional arg)
3347 "Toggle whether tooltips should show `* expr' or `expr'. 3347 "Toggle whether tooltips should show `* expr' or `expr'.
@@ -3380,8 +3380,8 @@ With arg, dereference expr if ARG is positive, otherwise do not derereference."
3380(defun gud-tooltip-tips (event) 3380(defun gud-tooltip-tips (event)
3381 "Show tip for identifier or selection under the mouse. 3381 "Show tip for identifier or selection under the mouse.
3382The mouse must either point at an identifier or inside a selected 3382The mouse must either point at an identifier or inside a selected
3383region for the tip window to be shown. If gud-tooltip-dereference is t, 3383region for the tip window to be shown. If `gud-tooltip-dereference' is t,
3384add a `*' in front of the printed expression. In the case of a C program 3384add a `*' in front of the printed expression. In the case of a C program
3385controlled by GDB, show the associated #define directives when program is 3385controlled by GDB, show the associated #define directives when program is
3386not executing. 3386not executing.
3387 3387