aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-07-29 13:20:39 +0000
committerJuanma Barranquero2008-07-29 13:20:39 +0000
commit32b1a27f286c7d588ef3c49559d3ecd08d1ef154 (patch)
tree78cad2eebed9aafcff124588859a2dfe46d31e84
parent3f7ead30616edd64bf159b74dfd28a9c7ab1c648 (diff)
downloademacs-32b1a27f286c7d588ef3c49559d3ecd08d1ef154.tar.gz
emacs-32b1a27f286c7d588ef3c49559d3ecd08d1ef154.zip
Typo fixes for Ada mode.
* progmodes/ada-mode.el (ada-batch-reformat): Doc fix. (ada-create-case-exception): Fix typo in docstring. (ada-no-auto-case): Return nil, not the docstring. (ada-indent-current): Reflow docstring. * progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values) (ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings. (ada-prj-load-from-file): Reflow docstring. (ada-prj-display-page): Fix typo in widget. * progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private): Fix typos in docstrings. * progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr) (ada-compile-current, ada-check-current, ada-run-application) (ada-get-ali-file-name): Fix typos in docstrings. (ada-xref-confirm-compile, ada-find-references) (ada-find-local-references, ada-find-any-references): Doc fixes. (ada-get-all-references): Fix typo in error message. (ada-xref-current-project): Use `let', not `let*'. (ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
-rw-r--r--lisp/ChangeLog24
-rw-r--r--lisp/progmodes/ada-mode.el10
-rw-r--r--lisp/progmodes/ada-prj.el17
-rw-r--r--lisp/progmodes/ada-stmt.el6
-rw-r--r--lisp/progmodes/ada-xref.el40
5 files changed, 61 insertions, 36 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 226bc0f73c4..4f30596b3b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
12008-07-29 Juanma Barranquero <lekktu@gmail.com>
2
3 * progmodes/ada-mode.el (ada-batch-reformat): Doc fix.
4 (ada-create-case-exception): Fix typo in docstring.
5 (ada-no-auto-case): Return nil, not the docstring.
6 (ada-indent-current): Reflow docstring.
7
8 * progmodes/ada-prj.el (ada-prj-edit, ada-prj-initialize-values)
9 (ada-prj-save-specific-option, ada-prj-field): Fix typos in docstrings.
10 (ada-prj-load-from-file): Reflow docstring.
11 (ada-prj-display-page): Fix typo in widget.
12
13 * progmodes/ada-stmt.el (ada-case, ada-package-body, ada-private):
14 Fix typos in docstrings.
15
16 * progmodes/ada-xref.el (ada-find-executable, ada-gnat-parse-gpr)
17 (ada-compile-current, ada-check-current, ada-run-application)
18 (ada-get-ali-file-name): Fix typos in docstrings.
19 (ada-xref-confirm-compile, ada-find-references)
20 (ada-find-local-references, ada-find-any-references): Doc fixes.
21 (ada-get-all-references): Fix typo in error message.
22 (ada-xref-current-project): Use `let', not `let*'.
23 (ada-do-file-completion, ada-xref-change-buffer): Reflow docstring.
24
12008-07-28 Vinicius Jose Latorre <viniciusjl@ig.com.br> 252008-07-28 Vinicius Jose Latorre <viniciusjl@ig.com.br>
2 26
3 * whitespace.el (whitespace-newline): Change initialization to have a 27 * whitespace.el (whitespace-newline): Change initialization to have a
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 0d619258ec5..ec5504e471c 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1432,7 +1432,7 @@ Casing exception lists are `ada-case-exception' and `ada-case-exception-substrin
1432(defun ada-create-case-exception (&optional word) 1432(defun ada-create-case-exception (&optional word)
1433 "Define WORD as an exception for the casing system. 1433 "Define WORD as an exception for the casing system.
1434If WORD is not given, then the current word in the buffer is used instead. 1434If WORD is not given, then the current word in the buffer is used instead.
1435The new words is added to the first file in `ada-case-exception-file'. 1435The new word is added to the first file in `ada-case-exception-file'.
1436The standard casing rules will no longer apply to this word." 1436The standard casing rules will no longer apply to this word."
1437 (interactive) 1437 (interactive)
1438 (let ((previous-syntax-table (syntax-table)) 1438 (let ((previous-syntax-table (syntax-table))
@@ -1752,7 +1752,7 @@ adapt to unusal auto-casing schemes. Since it does nothing, you can for
1752instance use it for `ada-case-identifier' if you don't want any special 1752instance use it for `ada-case-identifier' if you don't want any special
1753auto-casing for identifiers, whereas keywords have to be lower-cased. 1753auto-casing for identifiers, whereas keywords have to be lower-cased.
1754See also `ada-auto-case' to disable auto casing altogether." 1754See also `ada-auto-case' to disable auto casing altogether."
1755 ) 1755 nil)
1756 1756
1757(defun ada-capitalize-word (&optional arg) 1757(defun ada-capitalize-word (&optional arg)
1758 "Upcase first letter and letters following '_', lower case other letters. 1758 "Upcase first letter and letters following '_', lower case other letters.
@@ -2189,7 +2189,7 @@ The original line is indented first if `ada-indent-after-return' is non-nil."
2189 2189
2190(defun ada-batch-reformat () 2190(defun ada-batch-reformat ()
2191 "Re-indent and re-case all the files found on the command line. 2191 "Re-indent and re-case all the files found on the command line.
2192This function should be used from the Unix/Windows command line, with a 2192This function should be used from the command line, with a
2193command like: 2193command like:
2194 emacs -batch -l ada-mode -f ada-batch-reformat file1 file2 ..." 2194 emacs -batch -l ada-mode -f ada-batch-reformat file1 file2 ..."
2195 2195
@@ -2211,8 +2211,8 @@ Return the new position of point or nil if not found."
2211 2211
2212(defun ada-indent-current () 2212(defun ada-indent-current ()
2213 "Indent current line as Ada code. 2213 "Indent current line as Ada code.
2214Return the calculation that was done, including the reference point and the 2214Return the calculation that was done, including the reference point
2215offset." 2215and the offset."
2216 (interactive) 2216 (interactive)
2217 (let ((previous-syntax-table (syntax-table)) 2217 (let ((previous-syntax-table (syntax-table))
2218 (orgpoint (point-marker)) 2218 (orgpoint (point-marker))
diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index ea8319dbba5..9f1aa36cee3 100644
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -86,7 +86,7 @@
86 86
87(defun ada-prj-edit () 87(defun ada-prj-edit ()
88 "Editing the project file associated with the current Ada buffer. 88 "Editing the project file associated with the current Ada buffer.
89If there is none, opens a new project file" 89If there is none, opens a new project file."
90 (interactive) 90 (interactive)
91 (if ada-prj-default-project-file 91 (if ada-prj-default-project-file
92 (ada-customize) 92 (ada-customize)
@@ -94,8 +94,8 @@ If there is none, opens a new project file"
94 94
95(defun ada-prj-initialize-values (symbol ada-buffer filename) 95(defun ada-prj-initialize-values (symbol ada-buffer filename)
96 "Set SYMBOL to the property list of the project file FILENAME. 96 "Set SYMBOL to the property list of the project file FILENAME.
97If FILENAME is null, read the file associated with ADA-BUFFER. If no 97If FILENAME is null, read the file associated with ADA-BUFFER.
98project file is found, returns the default values." 98If no project file is found, return the default values."
99;; FIXME: rationalize arguments; make ada-buffer optional? 99;; FIXME: rationalize arguments; make ada-buffer optional?
100 (if (and filename 100 (if (and filename
101 (not (string= filename "")) 101 (not (string= filename ""))
@@ -112,7 +112,7 @@ project file is found, returns the default values."
112 112
113(defun ada-prj-save-specific-option (field) 113(defun ada-prj-save-specific-option (field)
114 "Return the string to print in the project file to save FIELD. 114 "Return the string to print in the project file to save FIELD.
115If the current value of FIELD is the default value, returns an empty string." 115If the current value of FIELD is the default value, return an empty string."
116 (if (string= (plist-get ada-prj-current-values field) 116 (if (string= (plist-get ada-prj-current-values field)
117 (plist-get ada-prj-default-values field)) 117 (plist-get ada-prj-default-values field))
118 "" 118 ""
@@ -184,7 +184,8 @@ If the current value of FIELD is the default value, returns an empty string."
184 ) 184 )
185 185
186(defun ada-prj-load-from-file (symbol) 186(defun ada-prj-load-from-file (symbol)
187 "Load SYMBOL value from file. One item per line should be found in the file." 187 "Load SYMBOL value from file.
188One item per line should be found in the file."
188 (save-excursion 189 (save-excursion
189 (let ((file (read-file-name "File name: " nil nil t)) 190 (let ((file (read-file-name "File name: " nil nil t))
190 (buffer (current-buffer)) 191 (buffer (current-buffer))
@@ -397,7 +398,7 @@ ignored by gnatfind and you don't see the references within.")
397 ((= tab-num 4) 398 ((= tab-num 4)
398 (widget-insert "/_____________\\/______________\\/______________\\/ \\/______________\\\n") 399 (widget-insert "/_____________\\/______________\\/______________\\/ \\/______________\\\n")
399 (widget-insert 400 (widget-insert
400"All the fields below can use variable substitution The syntax is ${name}, 401"All the fields below can use variable substitution. The syntax is ${name},
401where name is the name that appears after the Help buttons in this buffer. As 402where name is the name that appears after the Help buttons in this buffer. As
402a special case, ${current} is replaced with the name of the file currently 403a special case, ${current} is replaced with the name of the file currently
403edited, with directory name but no extension, whereas ${full_current} is 404edited, with directory name but no extension, whereas ${full_current} is
@@ -611,9 +612,9 @@ Parameters WIDGET-MODIFIED, EVENT match :notify for the widget."
611 "Create a widget to edit FIELD in the current buffer. 612 "Create a widget to edit FIELD in the current buffer.
612TEXT is a short explanation of what the field means, whereas HELP-TEXT 613TEXT is a short explanation of what the field means, whereas HELP-TEXT
613is the text displayed when the user pressed the help button. 614is the text displayed when the user pressed the help button.
614If IS-LIST is non-nil, the field contains a list. Otherwise, it contains 615If IS-LIST is non-nil, the field contains a list. Otherwise, it contains
615a single string. 616a single string.
616if IS-PATHS is true, some special buttons are added to load paths,... 617If IS-PATHS is true, some special buttons are added to load paths,...
617AFTER-TEXT is inserted just after the widget." 618AFTER-TEXT is inserted just after the widget."
618 (let ((value (plist-get ada-prj-current-values field)) 619 (let ((value (plist-get ada-prj-current-values field))
619 (inhibit-read-only t) 620 (inhibit-read-only t)
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index 811e026d9ae..8c1a0d285ec 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -94,7 +94,7 @@ Prompt for component type and index subtypes."
94 94
95(define-skeleton ada-case 95(define-skeleton ada-case
96 "Build skeleton case statement. 96 "Build skeleton case statement.
97Prompt for the selector expression. Also builds the first when clause." 97Prompt for the selector expression. Also builds the first when clause."
98 "[selector expression]: " 98 "[selector expression]: "
99 "case " str " is" \n 99 "case " str " is" \n
100 > "when " ("discrete choice: " str " | ") -3 " =>" \n 100 > "when " ("discrete choice: " str " | ") -3 " =>" \n
@@ -266,7 +266,7 @@ prompting for the boolean-expression."
266 266
267 267
268(define-skeleton ada-package-body 268(define-skeleton ada-package-body
269 "Insert a skeleton package body -- includes a begin statement." 269 "Insert a skeleton package body -- includes a begin statement."
270 "[package name]: " 270 "[package name]: "
271 "package body " str " is" \n 271 "package body " str " is" \n
272 > _ \n 272 > _ \n
@@ -275,7 +275,7 @@ prompting for the boolean-expression."
275 275
276 276
277(define-skeleton ada-private 277(define-skeleton ada-private
278 "Undent and start a private section of a package spec. Reindent." 278 "Undent and start a private section of a package spec. Reindent."
279 () 279 ()
280 < "private" \n 280 < "private" \n
281 >) 281 >)
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index e9b71d95a02..7470f8ca6b4 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -60,7 +60,7 @@ If nil, the cross-reference mode never runs gcc."
60 :type 'boolean :group 'ada) 60 :type 'boolean :group 'ada)
61 61
62(defcustom ada-xref-confirm-compile nil 62(defcustom ada-xref-confirm-compile nil
63 "*Non-nil means ask for confirmation before compiling or running the application." 63 "*If non-nil, ask for confirmation before compiling or running the application."
64 :type 'boolean :group 'ada) 64 :type 'boolean :group 'ada)
65 65
66(defcustom ada-krunch-args "0" 66(defcustom ada-krunch-args "0"
@@ -282,7 +282,7 @@ project file, a (nil . default-properties) entry is created.")
282(defun ada-find-executable (exec-name) 282(defun ada-find-executable (exec-name)
283 "Find the full path to the executable file EXEC-NAME. 283 "Find the full path to the executable file EXEC-NAME.
284If not found, throw an error. 284If not found, throw an error.
285On Windows systems, this will properly handle .exe extension as well" 285On Windows systems, this will properly handle .exe extension as well."
286 (let ((result (or (ada-find-file-in-dir exec-name exec-path) 286 (let ((result (or (ada-find-file-in-dir exec-name exec-path)
287 (ada-find-file-in-dir (concat exec-name ".exe") exec-path)))) 287 (ada-find-file-in-dir (concat exec-name ".exe") exec-path))))
288 (if result 288 (if result
@@ -351,7 +351,7 @@ CROSS-PREFIX is the prefix to use for the `gnatls' command."
351 351
352(defun ada-gnat-parse-gpr (plist gpr-file) 352(defun ada-gnat-parse-gpr (plist gpr-file)
353 "Set gpr_file, src_dir and obj_dir properties in PLIST by parsing GPR-FILE. 353 "Set gpr_file, src_dir and obj_dir properties in PLIST by parsing GPR-FILE.
354Returns new value of PLIST. 354Return new value of PLIST.
355GPR_FILE must be full path to file, normalized. 355GPR_FILE must be full path to file, normalized.
356src_dir, obj_dir will include compiler runtime. 356src_dir, obj_dir will include compiler runtime.
357Assumes environment variable ADA_PROJECT_PATH is set properly." 357Assumes environment variable ADA_PROJECT_PATH is set properly."
@@ -571,8 +571,8 @@ All the directories are returned as absolute directories."
571 571
572(defun ada-do-file-completion (string predicate flag) 572(defun ada-do-file-completion (string predicate flag)
573 "Completion function when reading a file from the minibuffer. 573 "Completion function when reading a file from the minibuffer.
574Completion is attempted in all the directories in the source path, as 574Completion is attempted in all the directories in the source path,
575defined in the project file." 575as defined in the project file."
576 ;; FIXME: doc arguments 576 ;; FIXME: doc arguments
577 577
578 ;; This function is not itself interactive, but it is called as part 578 ;; This function is not itself interactive, but it is called as part
@@ -625,7 +625,7 @@ Call `ada-require-project-file' first if a project must exist."
625(defun ada-xref-current-project () 625(defun ada-xref-current-project ()
626 "Return the current project. 626 "Return the current project.
627Call `ada-require-project-file' first to ensure a project exists." 627Call `ada-require-project-file' first to ensure a project exists."
628 (let* ((file-name (ada-xref-current-project-file))) 628 (let ((file-name (ada-xref-current-project-file)))
629 (assoc file-name ada-xref-project-files))) 629 (assoc file-name ada-xref-project-files)))
630 630
631(defun ada-show-current-project () 631(defun ada-show-current-project ()
@@ -968,8 +968,8 @@ Return new value of PROJECT."
968(defun ada-find-references (&optional pos arg local-only) 968(defun ada-find-references (&optional pos arg local-only)
969 "Find all references to the entity under POS. 969 "Find all references to the entity under POS.
970Calls gnatfind to find the references. 970Calls gnatfind to find the references.
971If ARG is t, the contents of the old *gnatfind* buffer is preserved. 971If ARG is non-nil, the contents of the old *gnatfind* buffer is preserved.
972If LOCAL-ONLY is t, only the declarations in the current file are returned." 972If LOCAL-ONLY is non-nil, only declarations in the current file are returned."
973 (interactive "d\nP") 973 (interactive "d\nP")
974 (ada-require-project-file) 974 (ada-require-project-file)
975 975
@@ -994,7 +994,7 @@ If LOCAL-ONLY is t, only the declarations in the current file are returned."
994(defun ada-find-local-references (&optional pos arg) 994(defun ada-find-local-references (&optional pos arg)
995 "Find all references to the entity under POS. 995 "Find all references to the entity under POS.
996Calls `gnatfind' to find the references. 996Calls `gnatfind' to find the references.
997If ARG is t, the contents of the old *gnatfind* buffer is preserved." 997If ARG is non-nil, the contents of the old *gnatfind* buffer is preserved."
998 (interactive "d\nP") 998 (interactive "d\nP")
999 (ada-find-references pos arg t)) 999 (ada-find-references pos arg t))
1000 1000
@@ -1004,10 +1004,10 @@ If ARG is t, the contents of the old *gnatfind* buffer is preserved."
1004 (entity &optional file line column local-only append) 1004 (entity &optional file line column local-only append)
1005 "Search for references to any entity whose name is ENTITY. 1005 "Search for references to any entity whose name is ENTITY.
1006ENTITY was first found the location given by FILE, LINE and COLUMN. 1006ENTITY was first found the location given by FILE, LINE and COLUMN.
1007If LOCAL-ONLY is t, then list only the references in FILE, which 1007If LOCAL-ONLY is non-nil, then list only the references in FILE,
1008is much faster. 1008which is much faster.
1009If APPEND is t, then append the output of the command to the existing 1009If APPEND is non-nil, then append the output of the command to the
1010buffer `*gnatfind*', if there is one." 1010existing buffer `*gnatfind*', if there is one."
1011 (interactive "sEntity name: ") 1011 (interactive "sEntity name: ")
1012 (ada-require-project-file) 1012 (ada-require-project-file)
1013 1013
@@ -1263,7 +1263,7 @@ If ARG is not nil, ask for user confirmation."
1263 1263
1264(defun ada-compile-current (&optional arg prj-field) 1264(defun ada-compile-current (&optional arg prj-field)
1265 "Recompile the current file. 1265 "Recompile the current file.
1266If ARG is not nil, ask for user confirmation of the command. 1266If ARG is non-nil, ask for user confirmation of the command.
1267PRJ-FIELD is the name of the field to use in the project file to get the 1267PRJ-FIELD is the name of the field to use in the project file to get the
1268command, and should be either `comp_cmd' (default) or `check_cmd'." 1268command, and should be either `comp_cmd' (default) or `check_cmd'."
1269 (interactive "P") 1269 (interactive "P")
@@ -1288,13 +1288,13 @@ command, and should be either `comp_cmd' (default) or `check_cmd'."
1288 1288
1289(defun ada-check-current (&optional arg) 1289(defun ada-check-current (&optional arg)
1290 "Check the current file for syntax errors. 1290 "Check the current file for syntax errors.
1291If ARG is not nil, ask for user confirmation of the command." 1291If ARG is non-nil, ask for user confirmation of the command."
1292 (interactive "P") 1292 (interactive "P")
1293 (ada-compile-current arg 'check_cmd)) 1293 (ada-compile-current arg 'check_cmd))
1294 1294
1295(defun ada-run-application (&optional arg) 1295(defun ada-run-application (&optional arg)
1296 "Run the application. 1296 "Run the application.
1297if ARG is not-nil, ask for user confirmation." 1297If ARG is non-nil, ask for user confirmation."
1298 (interactive) 1298 (interactive)
1299 (ada-require-project-file) 1299 (ada-require-project-file)
1300 1300
@@ -1523,7 +1523,7 @@ to gnatmake's behavior."
1523 (ada-find-file-in-dir file (ada-xref-get-src-dir-field))) 1523 (ada-find-file-in-dir file (ada-xref-get-src-dir-field)))
1524 1524
1525(defun ada-get-ali-file-name (file) 1525(defun ada-get-ali-file-name (file)
1526 "Create the ali file name for the ada-file FILE. 1526 "Create the ali file name for the Ada file FILE.
1527The file is searched for in every directory shown in the obj_dir lines of 1527The file is searched for in every directory shown in the obj_dir lines of
1528the project file." 1528the project file."
1529 1529
@@ -1812,7 +1812,7 @@ Information is extracted from the ali file."
1812 (progn 1812 (progn
1813 (kill-buffer ali-buffer) 1813 (kill-buffer ali-buffer)
1814 1814
1815 (error "No declaration of %s found." (ada-name-of identlist)) 1815 (error "No declaration of %s found" (ada-name-of identlist))
1816 ))) 1816 )))
1817 ) 1817 )
1818 1818
@@ -2147,8 +2147,8 @@ the declaration and documentation of the subprograms one is using."
2147(defun ada-xref-change-buffer 2147(defun ada-xref-change-buffer
2148 (file line column identlist &optional other-frame) 2148 (file line column identlist &optional other-frame)
2149 "Select and display FILE, at LINE and COLUMN. 2149 "Select and display FILE, at LINE and COLUMN.
2150If we do not end on the same identifier as IDENTLIST, find the closest 2150If we do not end on the same identifier as IDENTLIST, find the
2151match. Kills the .ali buffer at the end. 2151closest match. Kills the .ali buffer at the end.
2152If OTHER-FRAME is non-nil, creates a new frame to show the file." 2152If OTHER-FRAME is non-nil, creates a new frame to show the file."
2153 2153
2154 (let (declaration-buffer) 2154 (let (declaration-buffer)