From 1c7b6b3e0a8e6fe5c8a476b2c45c4b61c609bdfe Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 16 Nov 2014 22:26:17 -0800 Subject: [PATCH] Spelling fixes. --- lisp/cedet/ede/config.el | 22 +++++++++++----------- lisp/cedet/ede/cpp-root.el | 2 +- lisp/cedet/ede/detect.el | 16 ++++++++-------- lisp/cedet/ede/files.el | 6 +++--- lisp/cedet/semantic.el | 8 ++++---- lisp/cedet/semantic/db.el | 2 +- src/w32fns.c | 2 +- src/xfns.c | 2 +- test/automated/python-tests.el | 2 +- 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 @@ ;; can be enhanced by also saving a configuration file that is EDE ;; specific. EDE will be able to load that configuration from the save ;; file as a way of augmenting what is normally already detected. -;; +;; ;; How To Use: ;; ;; Subclass `ede-extra-config', and add the features you want to use. @@ -74,7 +74,7 @@ was ignored. Use this to warn the user that they might want to load in an on-disk version.") ) - "Baseclass for auxilliary configuration files for EDE. + "Baseclass for auxiliary configuration files for EDE. This should be subclassed by projects that auto detect a project and also want to save some extra level of configuration.") @@ -93,7 +93,7 @@ and also want to save some extra level of configuration.") :documentation "The filename to use for saving the configuration. This filename excludes the directory name and is used to -initalize the :file slot of the persistent baseclass.") +initialize the :file slot of the persistent baseclass.") (config-class :initform ede-extra-config :allocation :class @@ -109,7 +109,7 @@ initalize the :file slot of the persistent baseclass.") (defclass ede-target-with-config (ede-target) () - "Baseclass for targetes of classes that use a config object.") + "Baseclass for targets of classes that use a config object.") ;;; Rescanning @@ -141,8 +141,8 @@ the directory isn't on the `safe' list, ask to add it to the safe list." (let* ((top (oref proj :directory)) (fname (expand-file-name (oref proj config-file-basename) top)) (class (oref proj config-class)) - (ignore-type nil)) - (if (and (file-exists-p fname) + (ignore-type nil)) + (if (and (file-exists-p fname) (or (ede-directory-safe-p top) ;; Only force the load if someone asked. (and loadask (ede-check-project-directory top)))) @@ -217,13 +217,13 @@ the new configuration." ;;; PROJECT MIXINS ;; -;; These are project part mixins. Use multiple inheritence for each -;; piece of these configuration optiosn you would like to have as part +;; These are project part mixins. Use multiple inheritance for each +;; piece of these configuration options you would like to have as part ;; of your project. ;;; PROGRAM ;; If there is a program that can be run or debugged that is unknown -;; and needs to be configured. +;; and needs to be configured. (defclass ede-extra-config-program () ((debug-command :initarg :debug-command :initform "gdb " @@ -332,7 +332,7 @@ The include path is used when searching for symbols.") :documentation "Preprocessor Symbols for this project. When files within this project are parsed by CEDET, these symbols will be -used to resolve macro occurrences in source fies. +used to resolve macro occurrences in source files. If you modify this slot, you will need to force your source files to be parsed again.") (c-preprocessor-files :initarg :c-preprocessor-files @@ -343,7 +343,7 @@ parsed again.") :documentation "Files parsed and used to populate preprocessor tables. When files within this project are parsed by CEDET, these symbols will be used to -resolve macro occurences in source files. +resolve macro occurrences in source files. If you modify this slot, you will need to force your source files to be parsed again.")) "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.") (oset this :directory (file-name-directory f)) (ede-project-directory-remove-hash (file-name-directory f)) ;; NOTE: We must add to global list here because these classes are not - ;; created via the typial loader, but instead via calls from a .emacs + ;; created via the typical loader, but instead via calls from a .emacs ;; file. (ede-add-project-to-global-list this) 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 @@ ;; `ede-detect-scan-directory-for-project' - ;; Scan for a project via the file system. ;; `ede-detect-directory-for-project' - -;; Check our file cache for a project. If that failes, use +;; Check our file cache for a project. If that fails, use ;; the scan fcn above. ;;; Code: @@ -57,7 +57,7 @@ ;;stop)) (defvar ede--detect-found-project nil - "When searching for a project, temporarilly save that file.") + "When searching for a project, temporarily save that file.") (defun ede--detect-ldf-predicate (dir) "Non-nil if DIR contain any known EDE project types." @@ -81,7 +81,7 @@ use any file caches. Return a cons cell: ( ROOTDIR . PROJECT-AUTOLOAD)" (let* ((ede--detect-found-project nil) - (root + (root (catch 'stopscan (locate-dominating-file directory 'ede--detect-ldf-predicate)))) @@ -90,7 +90,7 @@ Return a cons cell: ;;; Root Only project detect ;; -;; For projects that only have a detectible ROOT file, but may in fact +;; For projects that only have a detectable ROOT file, but may in fact ;; contain a generic file such as a Makefile, we need to do a second scan ;; to make sure we don't miss-match. (defun ede--detect-ldf-rootonly-predicate (dir) @@ -117,7 +117,7 @@ use any file caches. Return a cons cell: ( ROOTDIR . PROJECT-AUTOLOAD)" (let* ((ede--detect-found-project nil) - (root + (root (catch 'stopscan (locate-dominating-file directory 'ede--detect-ldf-rootonly-predicate)))) @@ -149,7 +149,7 @@ Return a cons cell: "If DIRECTORY has already been detected with AUTO, find the root. Some projects have their dominating file in all their directories, such as Project.ede. In that case we will detect quickly, but then need -to scan upward to find the topmost occurance of that file." +to scan upward to find the topmost occurrence of that file." (let* ((ede--detect-nomatch-auto auto) (root (locate-dominating-file directory 'ede--detect-ldf-root-predicate))) @@ -179,7 +179,7 @@ Return a cons cell: (if moreroot moreroot - ;; If we didn't find a root from the generic project, then + ;; If we didn't find a root from the generic project, then ;; we need to rescan upward. (cons (ede--detect-scan-directory-for-project-root root auto) auto))) @@ -203,7 +203,7 @@ Return a cons cell: (car ans) (eieio-object-name-string (cdr ans))) (message "No Project found.") ))) - + (provide 'ede/detect) 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." ;; Why INODEs? -;; An inode represents is a unique id that trancends symlinks, hardlinks, etc +;; An inode represents a unique ID that transcends symlinks, hardlinks, etc. ;; so when we cache an inode in a project, and hash directories to inodes, we ;; can avoid costly filesystem queries and regex matches. @@ -196,7 +196,7 @@ If optional EXACT is non-nil, only return exact matches for DIR." (let ((pin (ede--project-inode (car all))) (inode (ede--inode-for-dir dir))) (and (not (eql pin 0)) (equal pin inode)))) - (setq ans (car all))) + (setq ans (car all))) ;; Subdir via truename - slower by far, but faster than a traditional lookup. ;; Note that we must resort to truename in order to resolve issues such as ;; cross-symlink projects. @@ -339,7 +339,7 @@ Optional FORCE means to ignore the hash of known directories." (ede--directory-project-add-description-to-hash dirtest (or detect 'nomatch)) detect) ))))) - + ;;; TOPLEVEL ;; 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. 'semantic-analyze-notc-completion-at-point-function) (add-hook 'completion-at-point-functions 'semantic-analyze-completion-at-point-function) - + (if global-ede-mode (define-key cedet-menu-map [cedet-menu-separator] '("--"))) (dolist (b (buffer-list)) @@ -1171,7 +1171,7 @@ Semantic mode. ;;; Completion At Point functions (defun semantic-analyze-completion-at-point-function () - "Return possible analasis completions at point. + "Return possible analysis completions at point. The completions provided are via `semantic-analyze-possible-completions'. This function can be used by `completion-at-point-functions'." (let* ((ctxt (semantic-analyze-current-context)) @@ -1187,7 +1187,7 @@ This function can be used by `completion-at-point-functions'." )) (defun semantic-analyze-notc-completion-at-point-function () - "Return possible analasis completions at point. + "Return possible analysis completions at point. The completions provided are via `semantic-analyze-possible-completions', but with the 'no-tc option passed in, which means constraints based on what is being assigned to are ignored. @@ -1202,7 +1202,7 @@ This function can be used by `completion-at-point-functions'." )) (defun semantic-analyze-nolongprefix-completion-at-point-function () - "Return possible analasis completions at point. + "Return possible analysis completions at point. The completions provided are via `semantic-analyze-possible-completions', but with the 'no-tc and 'no-longprefix option passed in, which means constraints 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'." ;; functions treat "table" as something that could be a buffer, ;; file name, or other. This makes use of table more robust. (defmethod semanticdb-full-filename (buffer-or-string) - "Fetch the full filename that BUFFER-OR-STRING referrs to. + "Fetch the full filename that BUFFER-OR-STRING refers to. This uses semanticdb to get a better file name." (cond ((bufferp buffer-or-string) (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. */) } DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0, - doc: /* Return geometric atributes of frame FRAME. + doc: /* Return geometric attributes of frame FRAME. FRAME must be a live frame and defaults to the selected one. The 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. */) } DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0, - doc: /* Return geometric atributes of frame FRAME. + doc: /* Return geometric attributes of frame FRAME. FRAME must be a live frame and defaults to the selected one. 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(): expected))))) (ert-deftest python-indent-region-4 () - "Test region indentation block starts, dedenders and enders." + "Test region indentation block starts, dedenters and enders." (let ((contents " def f(): if True: -- 2.11.4.GIT