aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-11-16 22:26:17 -0800
committerPaul Eggert2014-11-16 22:27:36 -0800
commit1c7b6b3e0a8e6fe5c8a476b2c45c4b61c609bdfe (patch)
treea5082b3b9eef087f521154f17becbb810ebf1017
parent0921dbc3ab4dcc6b291ef45e46a24b322bbcb885 (diff)
downloademacs-1c7b6b3e0a8e6fe5c8a476b2c45c4b61c609bdfe.tar.gz
emacs-1c7b6b3e0a8e6fe5c8a476b2c45c4b61c609bdfe.zip
Spelling fixes.
-rw-r--r--lisp/cedet/ede/config.el22
-rw-r--r--lisp/cedet/ede/cpp-root.el2
-rw-r--r--lisp/cedet/ede/detect.el16
-rw-r--r--lisp/cedet/ede/files.el6
-rw-r--r--lisp/cedet/semantic.el8
-rw-r--r--lisp/cedet/semantic/db.el2
-rw-r--r--src/w32fns.c2
-rw-r--r--src/xfns.c2
-rw-r--r--test/automated/python-tests.el2
9 files changed, 31 insertions, 31 deletions
diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el
index 3ac3c06f335..65713d9199c 100644
--- a/lisp/cedet/ede/config.el
+++ b/lisp/cedet/ede/config.el
@@ -25,7 +25,7 @@
25;; can be enhanced by also saving a configuration file that is EDE 25;; can be enhanced by also saving a configuration file that is EDE
26;; specific. EDE will be able to load that configuration from the save 26;; specific. EDE will be able to load that configuration from the save
27;; file as a way of augmenting what is normally already detected. 27;; file as a way of augmenting what is normally already detected.
28;; 28;;
29;; How To Use: 29;; How To Use:
30;; 30;;
31;; Subclass `ede-extra-config', and add the features you want to use. 31;; Subclass `ede-extra-config', and add the features you want to use.
@@ -74,7 +74,7 @@
74was ignored. Use this to warn the user that they might want to load in 74was ignored. Use this to warn the user that they might want to load in
75an on-disk version.") 75an on-disk version.")
76 ) 76 )
77 "Baseclass for auxilliary configuration files for EDE. 77 "Baseclass for auxiliary configuration files for EDE.
78This should be subclassed by projects that auto detect a project 78This should be subclassed by projects that auto detect a project
79and also want to save some extra level of configuration.") 79and also want to save some extra level of configuration.")
80 80
@@ -93,7 +93,7 @@ and also want to save some extra level of configuration.")
93 :documentation 93 :documentation
94 "The filename to use for saving the configuration. 94 "The filename to use for saving the configuration.
95This filename excludes the directory name and is used to 95This filename excludes the directory name and is used to
96initalize the :file slot of the persistent baseclass.") 96initialize the :file slot of the persistent baseclass.")
97 (config-class 97 (config-class
98 :initform ede-extra-config 98 :initform ede-extra-config
99 :allocation :class 99 :allocation :class
@@ -109,7 +109,7 @@ initalize the :file slot of the persistent baseclass.")
109 109
110(defclass ede-target-with-config (ede-target) 110(defclass ede-target-with-config (ede-target)
111 () 111 ()
112 "Baseclass for targetes of classes that use a config object.") 112 "Baseclass for targets of classes that use a config object.")
113 113
114;;; Rescanning 114;;; Rescanning
115 115
@@ -141,8 +141,8 @@ the directory isn't on the `safe' list, ask to add it to the safe list."
141 (let* ((top (oref proj :directory)) 141 (let* ((top (oref proj :directory))
142 (fname (expand-file-name (oref proj config-file-basename) top)) 142 (fname (expand-file-name (oref proj config-file-basename) top))
143 (class (oref proj config-class)) 143 (class (oref proj config-class))
144 (ignore-type nil)) 144 (ignore-type nil))
145 (if (and (file-exists-p fname) 145 (if (and (file-exists-p fname)
146 (or (ede-directory-safe-p top) 146 (or (ede-directory-safe-p top)
147 ;; Only force the load if someone asked. 147 ;; Only force the load if someone asked.
148 (and loadask (ede-check-project-directory top)))) 148 (and loadask (ede-check-project-directory top))))
@@ -217,13 +217,13 @@ the new configuration."
217 217
218;;; PROJECT MIXINS 218;;; PROJECT MIXINS
219;; 219;;
220;; These are project part mixins. Use multiple inheritence for each 220;; These are project part mixins. Use multiple inheritance for each
221;; piece of these configuration optiosn you would like to have as part 221;; piece of these configuration options you would like to have as part
222;; of your project. 222;; of your project.
223 223
224;;; PROGRAM 224;;; PROGRAM
225;; If there is a program that can be run or debugged that is unknown 225;; If there is a program that can be run or debugged that is unknown
226;; and needs to be configured. 226;; and needs to be configured.
227(defclass ede-extra-config-program () 227(defclass ede-extra-config-program ()
228 ((debug-command :initarg :debug-command 228 ((debug-command :initarg :debug-command
229 :initform "gdb " 229 :initform "gdb "
@@ -332,7 +332,7 @@ The include path is used when searching for symbols.")
332 :documentation 332 :documentation
333 "Preprocessor Symbols for this project. 333 "Preprocessor Symbols for this project.
334When files within this project are parsed by CEDET, these symbols will be 334When files within this project are parsed by CEDET, these symbols will be
335used to resolve macro occurrences in source fies. 335used to resolve macro occurrences in source files.
336If you modify this slot, you will need to force your source files to be 336If you modify this slot, you will need to force your source files to be
337parsed again.") 337parsed again.")
338 (c-preprocessor-files :initarg :c-preprocessor-files 338 (c-preprocessor-files :initarg :c-preprocessor-files
@@ -343,7 +343,7 @@ parsed again.")
343 :documentation 343 :documentation
344 "Files parsed and used to populate preprocessor tables. 344 "Files parsed and used to populate preprocessor tables.
345When files within this project are parsed by CEDET, these symbols will be used to 345When files within this project are parsed by CEDET, these symbols will be used to
346resolve macro occurences in source files. 346resolve macro occurrences in source files.
347If you modify this slot, you will need to force your source files to be 347If you modify this slot, you will need to force your source files to be
348parsed again.")) 348parsed again."))
349 "Class to mix into a configuration for compilation.") 349 "Class to mix into a configuration for compilation.")
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 7ea92364f28..0ccdc06f284 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -298,7 +298,7 @@ Each directory needs a project file to control it.")
298 (oset this :directory (file-name-directory f)) 298 (oset this :directory (file-name-directory f))
299 (ede-project-directory-remove-hash (file-name-directory f)) 299 (ede-project-directory-remove-hash (file-name-directory f))
300 ;; NOTE: We must add to global list here because these classes are not 300 ;; NOTE: We must add to global list here because these classes are not
301 ;; created via the typial loader, but instead via calls from a .emacs 301 ;; created via the typical loader, but instead via calls from a .emacs
302 ;; file. 302 ;; file.
303 (ede-add-project-to-global-list this) 303 (ede-add-project-to-global-list this)
304 304
diff --git a/lisp/cedet/ede/detect.el b/lisp/cedet/ede/detect.el
index 2b329185c84..cc731041814 100644
--- a/lisp/cedet/ede/detect.el
+++ b/lisp/cedet/ede/detect.el
@@ -28,7 +28,7 @@
28;; `ede-detect-scan-directory-for-project' - 28;; `ede-detect-scan-directory-for-project' -
29;; Scan for a project via the file system. 29;; Scan for a project via the file system.
30;; `ede-detect-directory-for-project' - 30;; `ede-detect-directory-for-project' -
31;; Check our file cache for a project. If that failes, use 31;; Check our file cache for a project. If that fails, use
32;; the scan fcn above. 32;; the scan fcn above.
33 33
34;;; Code: 34;;; Code:
@@ -57,7 +57,7 @@
57;;stop)) 57;;stop))
58 58
59(defvar ede--detect-found-project nil 59(defvar ede--detect-found-project nil
60 "When searching for a project, temporarilly save that file.") 60 "When searching for a project, temporarily save that file.")
61 61
62(defun ede--detect-ldf-predicate (dir) 62(defun ede--detect-ldf-predicate (dir)
63 "Non-nil if DIR contain any known EDE project types." 63 "Non-nil if DIR contain any known EDE project types."
@@ -81,7 +81,7 @@ use any file caches.
81Return a cons cell: 81Return a cons cell:
82 ( ROOTDIR . PROJECT-AUTOLOAD)" 82 ( ROOTDIR . PROJECT-AUTOLOAD)"
83 (let* ((ede--detect-found-project nil) 83 (let* ((ede--detect-found-project nil)
84 (root 84 (root
85 (catch 'stopscan 85 (catch 'stopscan
86 (locate-dominating-file directory 86 (locate-dominating-file directory
87 'ede--detect-ldf-predicate)))) 87 'ede--detect-ldf-predicate))))
@@ -90,7 +90,7 @@ Return a cons cell:
90 90
91;;; Root Only project detect 91;;; Root Only project detect
92;; 92;;
93;; For projects that only have a detectible ROOT file, but may in fact 93;; For projects that only have a detectable ROOT file, but may in fact
94;; contain a generic file such as a Makefile, we need to do a second scan 94;; contain a generic file such as a Makefile, we need to do a second scan
95;; to make sure we don't miss-match. 95;; to make sure we don't miss-match.
96(defun ede--detect-ldf-rootonly-predicate (dir) 96(defun ede--detect-ldf-rootonly-predicate (dir)
@@ -117,7 +117,7 @@ use any file caches.
117Return a cons cell: 117Return a cons cell:
118 ( ROOTDIR . PROJECT-AUTOLOAD)" 118 ( ROOTDIR . PROJECT-AUTOLOAD)"
119 (let* ((ede--detect-found-project nil) 119 (let* ((ede--detect-found-project nil)
120 (root 120 (root
121 (catch 'stopscan 121 (catch 'stopscan
122 (locate-dominating-file directory 122 (locate-dominating-file directory
123 'ede--detect-ldf-rootonly-predicate)))) 123 'ede--detect-ldf-rootonly-predicate))))
@@ -149,7 +149,7 @@ Return a cons cell:
149 "If DIRECTORY has already been detected with AUTO, find the root. 149 "If DIRECTORY has already been detected with AUTO, find the root.
150Some projects have their dominating file in all their directories, such 150Some projects have their dominating file in all their directories, such
151as Project.ede. In that case we will detect quickly, but then need 151as Project.ede. In that case we will detect quickly, but then need
152to scan upward to find the topmost occurance of that file." 152to scan upward to find the topmost occurrence of that file."
153 (let* ((ede--detect-nomatch-auto auto) 153 (let* ((ede--detect-nomatch-auto auto)
154 (root (locate-dominating-file directory 154 (root (locate-dominating-file directory
155 'ede--detect-ldf-root-predicate))) 155 'ede--detect-ldf-root-predicate)))
@@ -179,7 +179,7 @@ Return a cons cell:
179 (if moreroot 179 (if moreroot
180 moreroot 180 moreroot
181 181
182 ;; If we didn't find a root from the generic project, then 182 ;; If we didn't find a root from the generic project, then
183 ;; we need to rescan upward. 183 ;; we need to rescan upward.
184 (cons (ede--detect-scan-directory-for-project-root root auto) auto))) 184 (cons (ede--detect-scan-directory-for-project-root root auto) auto)))
185 185
@@ -203,7 +203,7 @@ Return a cons cell:
203 (car ans) 203 (car ans)
204 (eieio-object-name-string (cdr ans))) 204 (eieio-object-name-string (cdr ans)))
205 (message "No Project found.") ))) 205 (message "No Project found.") )))
206 206
207 207
208(provide 'ede/detect) 208(provide 'ede/detect)
209 209
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 1a97bfc4a5d..f9a855854c2 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -85,7 +85,7 @@ of the anchor file for the project."
85 85
86 86
87;; Why INODEs? 87;; Why INODEs?
88;; An inode represents is a unique id that trancends symlinks, hardlinks, etc 88;; An inode represents a unique ID that transcends symlinks, hardlinks, etc.
89;; so when we cache an inode in a project, and hash directories to inodes, we 89;; so when we cache an inode in a project, and hash directories to inodes, we
90;; can avoid costly filesystem queries and regex matches. 90;; can avoid costly filesystem queries and regex matches.
91 91
@@ -196,7 +196,7 @@ If optional EXACT is non-nil, only return exact matches for DIR."
196 (let ((pin (ede--project-inode (car all))) 196 (let ((pin (ede--project-inode (car all)))
197 (inode (ede--inode-for-dir dir))) 197 (inode (ede--inode-for-dir dir)))
198 (and (not (eql pin 0)) (equal pin inode)))) 198 (and (not (eql pin 0)) (equal pin inode))))
199 (setq ans (car all))) 199 (setq ans (car all)))
200 ;; Subdir via truename - slower by far, but faster than a traditional lookup. 200 ;; Subdir via truename - slower by far, but faster than a traditional lookup.
201 ;; Note that we must resort to truename in order to resolve issues such as 201 ;; Note that we must resort to truename in order to resolve issues such as
202 ;; cross-symlink projects. 202 ;; cross-symlink projects.
@@ -339,7 +339,7 @@ Optional FORCE means to ignore the hash of known directories."
339 (ede--directory-project-add-description-to-hash dirtest (or detect 'nomatch)) 339 (ede--directory-project-add-description-to-hash dirtest (or detect 'nomatch))
340 detect) 340 detect)
341 ))))) 341 )))))
342 342
343 343
344;;; TOPLEVEL 344;;; TOPLEVEL
345;; 345;;
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 7eddf827e49..6bd090cf838 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1136,7 +1136,7 @@ Semantic mode.
1136 'semantic-analyze-notc-completion-at-point-function) 1136 'semantic-analyze-notc-completion-at-point-function)
1137 (add-hook 'completion-at-point-functions 1137 (add-hook 'completion-at-point-functions
1138 'semantic-analyze-completion-at-point-function) 1138 'semantic-analyze-completion-at-point-function)
1139 1139
1140 (if global-ede-mode 1140 (if global-ede-mode
1141 (define-key cedet-menu-map [cedet-menu-separator] '("--"))) 1141 (define-key cedet-menu-map [cedet-menu-separator] '("--")))
1142 (dolist (b (buffer-list)) 1142 (dolist (b (buffer-list))
@@ -1171,7 +1171,7 @@ Semantic mode.
1171 1171
1172;;; Completion At Point functions 1172;;; Completion At Point functions
1173(defun semantic-analyze-completion-at-point-function () 1173(defun semantic-analyze-completion-at-point-function ()
1174 "Return possible analasis completions at point. 1174 "Return possible analysis completions at point.
1175The completions provided are via `semantic-analyze-possible-completions'. 1175The completions provided are via `semantic-analyze-possible-completions'.
1176This function can be used by `completion-at-point-functions'." 1176This function can be used by `completion-at-point-functions'."
1177 (let* ((ctxt (semantic-analyze-current-context)) 1177 (let* ((ctxt (semantic-analyze-current-context))
@@ -1187,7 +1187,7 @@ This function can be used by `completion-at-point-functions'."
1187 )) 1187 ))
1188 1188
1189(defun semantic-analyze-notc-completion-at-point-function () 1189(defun semantic-analyze-notc-completion-at-point-function ()
1190 "Return possible analasis completions at point. 1190 "Return possible analysis completions at point.
1191The completions provided are via `semantic-analyze-possible-completions', 1191The completions provided are via `semantic-analyze-possible-completions',
1192but with the 'no-tc option passed in, which means constraints based 1192but with the 'no-tc option passed in, which means constraints based
1193on what is being assigned to are ignored. 1193on what is being assigned to are ignored.
@@ -1202,7 +1202,7 @@ This function can be used by `completion-at-point-functions'."
1202 )) 1202 ))
1203 1203
1204(defun semantic-analyze-nolongprefix-completion-at-point-function () 1204(defun semantic-analyze-nolongprefix-completion-at-point-function ()
1205 "Return possible analasis completions at point. 1205 "Return possible analysis completions at point.
1206The completions provided are via `semantic-analyze-possible-completions', 1206The completions provided are via `semantic-analyze-possible-completions',
1207but with the 'no-tc and 'no-longprefix option passed in, which means 1207but with the 'no-tc and 'no-longprefix option passed in, which means
1208constraints resulting in a long multi-symbol dereference are ignored. 1208constraints resulting in a long multi-symbol dereference are ignored.
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 12be66225a1..13e2d1b37d4 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -128,7 +128,7 @@ If the buffer is not in memory, load it with `find-file-noselect'."
128;; functions treat "table" as something that could be a buffer, 128;; functions treat "table" as something that could be a buffer,
129;; file name, or other. This makes use of table more robust. 129;; file name, or other. This makes use of table more robust.
130(defmethod semanticdb-full-filename (buffer-or-string) 130(defmethod semanticdb-full-filename (buffer-or-string)
131 "Fetch the full filename that BUFFER-OR-STRING referrs to. 131 "Fetch the full filename that BUFFER-OR-STRING refers to.
132This uses semanticdb to get a better file name." 132This uses semanticdb to get a better file name."
133 (cond ((bufferp buffer-or-string) 133 (cond ((bufferp buffer-or-string)
134 (with-current-buffer buffer-or-string 134 (with-current-buffer buffer-or-string
diff --git a/src/w32fns.c b/src/w32fns.c
index 502154d4473..1b290b7919a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7434,7 +7434,7 @@ title bar and decorations. */)
7434} 7434}
7435 7435
7436DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0, 7436DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0,
7437 doc: /* Return geometric atributes of frame FRAME. 7437 doc: /* Return geometric attributes of frame FRAME.
7438FRAME must be a live frame and defaults to the selected one. 7438FRAME must be a live frame and defaults to the selected one.
7439 7439
7440The return value is an association list containing the following 7440The return value is an association list containing the following
diff --git a/src/xfns.c b/src/xfns.c
index 3ca8f20dd72..aaa75f285fd 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4235,7 +4235,7 @@ Internal use only, use `display-monitor-attributes-list' instead. */)
4235} 4235}
4236 4236
4237DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0, 4237DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0,
4238 doc: /* Return geometric atributes of frame FRAME. 4238 doc: /* Return geometric attributes of frame FRAME.
4239 4239
4240FRAME must be a live frame and defaults to the selected one. 4240FRAME must be a live frame and defaults to the selected one.
4241 4241
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index e4ce5355a84..1b9d774b010 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -797,7 +797,7 @@ def f():
797 expected))))) 797 expected)))))
798 798
799(ert-deftest python-indent-region-4 () 799(ert-deftest python-indent-region-4 ()
800 "Test region indentation block starts, dedenders and enders." 800 "Test region indentation block starts, dedenters and enders."
801 (let ((contents " 801 (let ((contents "
802def f(): 802def f():
803 if True: 803 if True: