aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-10-01 04:10:10 +0000
committerGlenn Morris2009-10-01 04:10:10 +0000
commita785b776a75832734952ddba204a7b89f3fa8462 (patch)
tree21826e2a2cc84ee5ad3ce3902b298365f6244ee3
parent0b253b125133b0ef647c7172721d7241a2f05abc (diff)
downloademacs-a785b776a75832734952ddba204a7b89f3fa8462.tar.gz
emacs-a785b776a75832734952ddba204a7b89f3fa8462.zip
Doc/message fixes.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/cedet/ede/autoconf-edit.el8
-rw-r--r--lisp/cedet/ede/cpp-root.el8
-rw-r--r--lisp/cedet/ede/files.el2
-rw-r--r--lisp/cedet/ede/makefile-edit.el4
-rw-r--r--lisp/cedet/ede/proj-comp.el8
-rw-r--r--lisp/cedet/ede/proj-elisp.el6
-rw-r--r--lisp/cedet/ede/proj.el4
-rw-r--r--lisp/cedet/ede/project-am.el10
-rw-r--r--lisp/cedet/ede/source.el2
10 files changed, 37 insertions, 26 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03566e96c28..552ee4538b5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -39,6 +39,17 @@
39 * cedet/semantic.el (semantic-minimum-working-buffer-size) 39 * cedet/semantic.el (semantic-minimum-working-buffer-size)
40 (semantic-fetch-tags, semantic-submode-list) 40 (semantic-fetch-tags, semantic-submode-list)
41 (semantic-default-submodes): 41 (semantic-default-submodes):
42 * cedet/ede/source.el (ede-source-match):
43 * cedet/ede/project-am.el (project-am-type-alist, project-add-file)
44 (project-am-package-info):
45 * cedet/ede/proj.el (ede-proj-target, project-new-target):
46 * cedet/ede/proj-elisp.el (ede-proj-tweak-autoconf):
47 * cedet/ede/proj-comp.el (ede-current-build-list):
48 * cedet/ede/makefile-edit.el (makefile-move-to-macro):
49 * cedet/ede/files.el (ede-toplevel-project-or-nil):
50 * cedet/ede/cpp-root.el (initialize-instance):
51 * cedet/ede/autoconf-edit.el (autoconf-find-last-macro)
52 (autoconf-parameter-strip, autoconf-insert-new-macro):
42 * cedet/srecode/table.el (srecode-mode-table-new): 53 * cedet/srecode/table.el (srecode-mode-table-new):
43 * cedet/srecode/srt.el (srecode-read-variable-name): 54 * cedet/srecode/srt.el (srecode-read-variable-name):
44 * cedet/srecode/srt-mode.el (srecode-macro-help, srecode-in-macro-p): 55 * cedet/srecode/srt-mode.el (srecode-macro-help, srecode-in-macro-p):
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index a59512da3e0..8b5f8c42681 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -1,6 +1,6 @@
1;;; ede/autoconf-edit.el --- Keymap for autoconf 1;;; ede/autoconf-edit.el --- Keymap for autoconf
2 2
3;;; Copyright (C) 1998, 1999, 2000, 2009 Free Software Foundation, Inc. 3;; Copyright (C) 1998, 1999, 2000, 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <zappo@gnu.org> 5;; Author: Eric M. Ludlam <zappo@gnu.org>
6;; Keywords: project 6;; Keywords: project
@@ -152,7 +152,7 @@ From the autoconf manual:
152 (looking-at (concat "\\(A[CM]_" macro "\\|" macro "\\)")))) 152 (looking-at (concat "\\(A[CM]_" macro "\\|" macro "\\)"))))
153 153
154(defun autoconf-find-last-macro (macro) 154(defun autoconf-find-last-macro (macro)
155 "Move to the last occurance of MACRO in FILE, and return that point. 155 "Move to the last occurrence of MACRO in FILE, and return that point.
156The last macro is usually the one in which we would like to insert more 156The last macro is usually the one in which we would like to insert more
157items such as CHECK_HEADERS." 157items such as CHECK_HEADERS."
158 (let ((op (point))) 158 (let ((op (point)))
@@ -165,7 +165,7 @@ items such as CHECK_HEADERS."
165 nil))) 165 nil)))
166 166
167(defun autoconf-parameter-strip (param) 167(defun autoconf-parameter-strip (param)
168 "Strip the parameter PARAM of whitespace and misc characters." 168 "Strip the parameter PARAM of whitespace and miscellaneous characters."
169 (when (string-match "^\\s-*\\[?\\s-*" param) 169 (when (string-match "^\\s-*\\[?\\s-*" param)
170 (setq param (substring param (match-end 0)))) 170 (setq param (substring param (match-end 0))))
171 (when (string-match "\\s-*\\]?\\s-*$" param) 171 (when (string-match "\\s-*\\]?\\s-*$" param)
@@ -227,7 +227,7 @@ Optional argument PARAM is the parameter to pass to the macro as one string."
227 (autoconf-insert-macro-at-point macro param)) 227 (autoconf-insert-macro-at-point macro param))
228 ((member macro autoconf-multiple-multiple-macros) 228 ((member macro autoconf-multiple-multiple-macros)
229 (if (not param) 229 (if (not param)
230 (error "You must have a paramter for %s" macro)) 230 (error "You must have a parameter for %s" macro))
231 (if (not (autoconf-find-last-macro macro)) 231 (if (not (autoconf-find-last-macro macro))
232 (progn 232 (progn
233 ;; Doesn't exist yet.... 233 ;; Doesn't exist yet....
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index a922cc15782..d2d792e5df5 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -30,7 +30,7 @@
30;; 30;;
31;; The cpp-root project type will allow you to create a single object 31;; The cpp-root project type will allow you to create a single object
32;; with no save-file in your .emacs file that will be recognized, and 32;; with no save-file in your .emacs file that will be recognized, and
33;; provide a way to easilly allow EDE to provide Semantic with the 33;; provide a way to easily allow EDE to provide Semantic with the
34;; ability to find header files, and other various source files 34;; ability to find header files, and other various source files
35;; quickly. 35;; quickly.
36;; 36;;
@@ -42,7 +42,7 @@
42;; 42;;
43;;; EXAMPLE 43;;; EXAMPLE
44;; 44;;
45;; Add this to your .emacs file, modifying apropriate bits as needed. 45;; Add this to your .emacs file, modifying appropriate bits as needed.
46;; 46;;
47;; (ede-cpp-root-project "SOMENAME" :file "/dir/to/some/file") 47;; (ede-cpp-root-project "SOMENAME" :file "/dir/to/some/file")
48;; 48;;
@@ -109,7 +109,7 @@
109;; `ede-project-class-files' list, and also provide two functions to 109;; `ede-project-class-files' list, and also provide two functions to
110;; teach EDE how to load your project pattern 110;; teach EDE how to load your project pattern
111;; 111;;
112;; It would oook like this: 112;; It would look like this:
113;; 113;;
114;; (defun MY-FILE-FOR-DIR (&optional dir) 114;; (defun MY-FILE-FOR-DIR (&optional dir)
115;; "Return a full file name to the project file stored in DIR." 115;; "Return a full file name to the project file stored in DIR."
@@ -349,7 +349,7 @@ Each directory needs a a project file to control it.")
349 (when (or (not (file-exists-p f)) 349 (when (or (not (file-exists-p f))
350 (file-directory-p f)) 350 (file-directory-p f))
351 (delete-instance this) 351 (delete-instance this)
352 (error ":file for ede-cpp-root must be a file.")) 352 (error ":file for ede-cpp-root must be a file"))
353 (oset this :file f) 353 (oset this :file f)
354 (oset this :directory (file-name-directory f)) 354 (oset this :directory (file-name-directory f))
355 (ede-project-directory-remove-hash (file-name-directory f)) 355 (ede-project-directory-remove-hash (file-name-directory f))
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 148ebb382da..e4383493f34 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -290,7 +290,7 @@ This depends on an up to date `ede-project-class-files' variable."
290;; 290;;
291(defun ede-toplevel-project-or-nil (dir) 291(defun ede-toplevel-project-or-nil (dir)
292 "Starting with DIR, find the toplevel project directory, or return nil. 292 "Starting with DIR, find the toplevel project directory, or return nil.
293nil is returned if the current directory is not a part ofa project." 293nil is returned if the current directory is not a part of a project."
294 (let* ((ans (ede-directory-get-toplevel-open-project dir))) 294 (let* ((ans (ede-directory-get-toplevel-open-project dir)))
295 (if ans 295 (if ans
296 (oref ans :directory) 296 (oref ans :directory)
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 7810657a3af..30ffca70dda 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -1,6 +1,6 @@
1;;; makefile-edit.el --- Makefile editing/scanning commands. 1;;; makefile-edit.el --- Makefile editing/scanning commands.
2 2
3;;; Copyright (C) 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <eric@siege-engine.com> 5;; Author: Eric M. Ludlam <eric@siege-engine.com>
6 6
@@ -75,7 +75,7 @@
75;; 75;;
76(defun makefile-move-to-macro (macro &optional next) 76(defun makefile-move-to-macro (macro &optional next)
77 "Move to the definition of MACRO. Return t if found. 77 "Move to the definition of MACRO. Return t if found.
78If NEXT is non-nil, move to the next occurance of MACRO." 78If NEXT is non-nil, move to the next occurrence of MACRO."
79 (let ((oldpt (point))) 79 (let ((oldpt (point)))
80 (when (not next) (goto-char (point-min))) 80 (when (not next) (goto-char (point-min)))
81 (if (re-search-forward (concat "^\\s-*" macro "\\s-*[+:?]?=") nil t) 81 (if (re-search-forward (concat "^\\s-*" macro "\\s-*[+:?]?=") nil t)
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 4c94b18f8f6..550cb992cc1 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -1,7 +1,7 @@
1;;; ede/proj-comp.el --- EDE Generic Project compiler/rule driver 1;;; ede/proj-comp.el --- EDE Generic Project compiler/rule driver
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2004, 2005, 2007, 2009 3;; Copyright (C) 1999, 2000, 2001, 2004, 2005, 2007, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: project, make 7;; Keywords: project, make
@@ -31,7 +31,7 @@
31;; source code. Users can also define new compiler types whenever they 31;; source code. Users can also define new compiler types whenever they
32;; some customized behavior. 32;; some customized behavior.
33;; 33;;
34;; The `ede-makefile-rule' class lets users add customized rules into thier 34;; The `ede-makefile-rule' class lets users add customized rules into their
35;; objects, and also lets different compilers add chaining rules to their 35;; objects, and also lets different compilers add chaining rules to their
36;; behaviors. 36;; behaviors.
37;; 37;;
@@ -169,7 +169,7 @@ Adds this rule to a .PHONY list."))
169 169
170(defvar ede-current-build-list nil 170(defvar ede-current-build-list nil
171 "List of EDE compilers that have already inserted parts of themselves. 171 "List of EDE compilers that have already inserted parts of themselves.
172This is used when creating a Makefile to prevend duplicate variables and 172This is used when creating a Makefile to prevent duplicate variables and
173rules from being created.") 173rules from being created.")
174 174
175(defmethod initialize-instance :AFTER ((this ede-compiler) &rest fields) 175(defmethod initialize-instance :AFTER ((this ede-compiler) &rest fields)
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index b2ec7124605..f6ddf4963eb 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -1,7 +1,7 @@
1;;; ede-proj-elisp.el --- EDE Generic Project Emacs Lisp support 1;;; ede-proj-elisp.el --- EDE Generic Project Emacs Lisp support
2 2
3;;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 3;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
4;;; 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2007, 2008, 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: project, make 7;; Keywords: project, make
@@ -384,7 +384,7 @@ Argument THIS is the target which needs to insert an info file."
384 384
385(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp-autoloads)) 385(defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp-autoloads))
386 "Tweak the configure file (current buffer) to accomodate THIS." 386 "Tweak the configure file (current buffer) to accomodate THIS."
387 (error "Autoloads not supported in autoconf yet.")) 387 (error "Autoloads not supported in autoconf yet"))
388 388
389(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp-autoloads)) 389(defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp-autoloads))
390 "Flush the configure file (current buffer) to accomodate THIS." 390 "Flush the configure file (current buffer) to accomodate THIS."
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index e8d3501c913..6d05260206e 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -63,7 +63,7 @@
63 :custom (repeat (string :tag "File")) 63 :custom (repeat (string :tag "File"))
64 :label "Auxiliary Source Files" 64 :label "Auxiliary Source Files"
65 :group (default source) 65 :group (default source)
66 :documentation "Auxilliary source files included in this target. 66 :documentation "Auxiliary source files included in this target.
67Each of these is considered equivalent to a source file, but it is not 67Each of these is considered equivalent to a source file, but it is not
68distributed, and each should have a corresponding rule to build it.") 68distributed, and each should have a corresponding rule to build it.")
69 (dirty :initform nil 69 (dirty :initform nil
@@ -367,7 +367,7 @@ Argument TARGET is the project we are completing customization on."
367 ) 367 )
368 368
369 (when (not fcn) 369 (when (not fcn)
370 (error "Unknown target type %s for EDE Project." type)) 370 (error "Unknown target type %s for EDE Project" type))
371 371
372 (setq ot (funcall fcn name :name name 372 (setq ot (funcall fcn name :name name
373 :path (ede-convert-path this default-directory) 373 :path (ede-convert-path this default-directory)
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index c7045dc69df..e2a9a3df5e2 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -1,7 +1,7 @@
1;;; project-am.el --- A project management scheme based on automake files. 1;;; project-am.el --- A project management scheme based on automake files.
2 2
3;;; Copyright (C) 1998, 1999, 2000, 2003, 2005, 2007, 2008, 2009 3;; Copyright (C) 1998, 1999, 2000, 2003, 2005, 2007, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Version: 0.0.3 7;; Version: 0.0.3
@@ -105,7 +105,7 @@
105 ) 105 )
106 "Alist of type names and the type of object to create for them. 106 "Alist of type names and the type of object to create for them.
107Each entry is of th form: 107Each entry is of th form:
108 (EMACSNAME CLASS AUToMAKEVAR INDIRECT) 108 (EMACSNAME CLASS AUTOMAKEVAR INDIRECT)
109where EMACSNAME is a name for Emacs to use. 109where EMACSNAME is a name for Emacs to use.
110CLASS is the EDE target class to represent the target. 110CLASS is the EDE target class to represent the target.
111AUTOMAKEVAR is the Automake variable to identify. This cannot be a 111AUTOMAKEVAR is the Automake variable to identify. This cannot be a
@@ -188,7 +188,7 @@ question lists other variables that need to be looked up.")
188(defmethod project-add-file ((ot project-am-target)) 188(defmethod project-add-file ((ot project-am-target))
189 "Add the current buffer into a project. 189 "Add the current buffer into a project.
190OT is the object target. DIR is the directory to start in." 190OT is the object target. DIR is the directory to start in."
191 (let* ((target (if ede-object (error "Already assocated w/ a target") 191 (let* ((target (if ede-object (error "Already associated w/ a target")
192 (let ((amf (project-am-load default-directory))) 192 (let ((amf (project-am-load default-directory)))
193 (if (not amf) (error "No project file")) 193 (if (not amf) (error "No project file"))
194 (completing-read "Target: " 194 (completing-read "Target: "
@@ -984,7 +984,7 @@ Kill the Configure buffer if it was not already in a buffer."
984 984
985(defun project-am-package-info (dir) 985(defun project-am-package-info (dir)
986 "Get the package information for directory topmost project dir over DIR. 986 "Get the package information for directory topmost project dir over DIR.
987Calcultes the info with `project-am-extract-package-info'." 987Calculates the info with `project-am-extract-package-info'."
988 (let ((top (ede-toplevel))) 988 (let ((top (ede-toplevel)))
989 (when top (setq dir (oref top :directory))) 989 (when top (setq dir (oref top :directory)))
990 (project-am-extract-package-info dir))) 990 (project-am-extract-package-info dir)))
diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el
index ef87bdf79d7..2c74d34dea7 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -139,7 +139,7 @@ Used to guess header files, but uses the auxsource regular expression."
139 (object-assoc name :name ede-sourcecode-list)) 139 (object-assoc name :name ede-sourcecode-list))
140 140
141(defun ede-source-match (file) 141(defun ede-source-match (file)
142 "Find the list of soucecode objects which matches FILE." 142 "Find the list of sourcecode objects which matches FILE."
143 (let ((lst ede-sourcecode-list) 143 (let ((lst ede-sourcecode-list)
144 (match nil)) 144 (match nil))
145 (while lst 145 (while lst