diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog.17 | 10 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 2 | ||||
| -rw-r--r-- | lisp/net/soap-client.el | 6 | ||||
| -rw-r--r-- | lisp/net/soap-inspect.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/project.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 8a255d756f1..d717a4db62f 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -4146,7 +4146,7 @@ 2014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change) * emacs-lisp/package.el (package-menu-mode): Use an extra column - for the "Version" column, to accomodate date-and-time-based versions. + for the "Version" column, to accommodate date-and-time-based versions. 2014-12-14 Cameron Desautels <camdez@gmail.com> @@ -8700,9 +8700,9 @@ (python-shell-prompt-detect) (python-shell-prompt-validate-regexps): New functions. (python-shell-prompt-set-calculated-regexps): New function. - (inferior-python-mode): Use it. Also honor overriden + (inferior-python-mode): Use it. Also honor overridden python-shell-interpreter and python-shell-interpreter-args. - (python-shell-make-comint): Honor overriden + (python-shell-make-comint): Honor overridden python-shell-interpreter and python-shell-interpreter-args. (python-shell-get-or-create-process): Make it testable by allowing to call run-python non-interactively. @@ -10975,9 +10975,9 @@ * faces.el (face-spec-recalc): Apply X resources only after the defface spec has been applied. Thus, X resources are no longer - overriden by the defface spec which also fixes issues on win32 where + overridden by the defface spec which also fixes issues on win32 where the toolbar coloring was wrong because it is set through X resources - and was (wrongfully) overriden. (Bug#16694) + and was (wrongfully) overridden. (Bug#16694) 2014-04-30 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index aae517e8ea7..9e6102c7300 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -268,7 +268,7 @@ This macro can only be used within the lexical scope of a cl-generic method." (defmacro cl-generic-define-context-rewriter (name args &rest body) "Define a special kind of context named NAME. -Whenever a context specializer of the form (NAME . ACTUALS) appears, +Whenever a context specializer of the form (NAME . ARGS) appears, the specializer used will be the one returned by BODY." (declare (debug (&define name lambda-list def-body)) (indent defun)) `(eval-and-compile diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index 264a39c1899..83173250137 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -390,7 +390,7 @@ binding) but the same name." ;; SOAP WSDL documents use XML Schema to define the types that are part of the ;; message exchange. We include here an XML schema model with a parser and -;; serializer/deserialiser. +;; serializer/deserializer. (defstruct (soap-xs-type (:include soap-element)) id @@ -710,7 +710,7 @@ This is a specialization of `soap-decode-type' for (defun soap-xs-element-type (element) "Retrieve the type of ELEMENT. This is normally stored in the TYPE^ slot, but if this element -contains a reference, we retrive the type of the reference." +contains a reference, retrieve the type of the reference." (if (soap-xs-element-reference element) (soap-xs-element-type (soap-xs-element-reference element)) (soap-xs-element-type^ element))) @@ -1989,7 +1989,7 @@ This is a specialization of `soap-decode-type' for ) (defun soap-make-wsdl (origin) - "Create a new WSDL document, loaded from ORIGIN, and intialize it." + "Create a new WSDL document, loaded from ORIGIN, and initialize it." (let ((wsdl (soap-make-wsdl^ :origin origin))) ;; Add the XSD types to the wsdl document diff --git a/lisp/net/soap-inspect.el b/lisp/net/soap-inspect.el index f6c7da6c7cd..b01e2bf76f1 100644 --- a/lisp/net/soap-inspect.el +++ b/lisp/net/soap-inspect.el @@ -334,7 +334,7 @@ soap-xs-attribute-group, in the current buffer." (insert "\t") (soap-insert-describe-button type))) (when (soap-xs-simple-type-enumeration type) - (insert "\nEnumeraton values: ") + (insert "\nEnumeration values: ") (dolist (e (soap-xs-simple-type-enumeration type)) (insert "\n\t") (pp e))) diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 295e544044a..398339ee590 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -108,7 +108,7 @@ Most often it's just one directory, which contains the project file and everything else in the project. But in more advanced configurations, a project can span multiple directories. -The rule of tumb for whether to include a directory here, and not +The rule of thumb for whether to include a directory here, and not in `project-library-roots', is whether its contents are meant to be edited together with the rest of the project. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index efd816b4f0e..178b5f0c0ce 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2071,7 +2071,7 @@ changes from the current branch." ;;;###autoload (defun vc-message-unresolved-conflicts (filename) "Display a message indicating unresolved conflicts in FILENAME." - ;; This enables all VC backends to give a standard, recognizeable + ;; This enables all VC backends to give a standard, recognizable ;; conflict message that indicates which file is conflicted. (message "There are unresolved conflicts in %s" filename)) |