aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2015-11-10 10:22:29 -0800
committerPaul Eggert2015-11-10 10:23:00 -0800
commitc92dbd6d0c234ff993acb0a095c024593bc185c8 (patch)
treef6e1be4508825d465244f4849e2ab33209d8cc84 /lisp
parentd149ca81c33ab95900306c3c71f6eff62a3ec1a1 (diff)
downloademacs-c92dbd6d0c234ff993acb0a095c024593bc185c8.tar.gz
emacs-c92dbd6d0c234ff993acb0a095c024593bc185c8.zip
Spelling fixes
* lisp/net/soap-inspect.el (soap-inspect-xs-simple-type): Fix misspelling in output.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.1710
-rw-r--r--lisp/emacs-lisp/cl-generic.el2
-rw-r--r--lisp/net/soap-client.el6
-rw-r--r--lisp/net/soap-inspect.el2
-rw-r--r--lisp/progmodes/project.el2
-rw-r--r--lisp/vc/vc.el2
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 @@
41462014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change) 41462014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change)
4147 4147
4148 * emacs-lisp/package.el (package-menu-mode): Use an extra column 4148 * emacs-lisp/package.el (package-menu-mode): Use an extra column
4149 for the "Version" column, to accomodate date-and-time-based versions. 4149 for the "Version" column, to accommodate date-and-time-based versions.
4150 4150
41512014-12-14 Cameron Desautels <camdez@gmail.com> 41512014-12-14 Cameron Desautels <camdez@gmail.com>
4152 4152
@@ -8700,9 +8700,9 @@
8700 (python-shell-prompt-detect) 8700 (python-shell-prompt-detect)
8701 (python-shell-prompt-validate-regexps): New functions. 8701 (python-shell-prompt-validate-regexps): New functions.
8702 (python-shell-prompt-set-calculated-regexps): New function. 8702 (python-shell-prompt-set-calculated-regexps): New function.
8703 (inferior-python-mode): Use it. Also honor overriden 8703 (inferior-python-mode): Use it. Also honor overridden
8704 python-shell-interpreter and python-shell-interpreter-args. 8704 python-shell-interpreter and python-shell-interpreter-args.
8705 (python-shell-make-comint): Honor overriden 8705 (python-shell-make-comint): Honor overridden
8706 python-shell-interpreter and python-shell-interpreter-args. 8706 python-shell-interpreter and python-shell-interpreter-args.
8707 (python-shell-get-or-create-process): Make it testable by allowing 8707 (python-shell-get-or-create-process): Make it testable by allowing
8708 to call run-python non-interactively. 8708 to call run-python non-interactively.
@@ -10975,9 +10975,9 @@
10975 10975
10976 * faces.el (face-spec-recalc): Apply X resources only after the 10976 * faces.el (face-spec-recalc): Apply X resources only after the
10977 defface spec has been applied. Thus, X resources are no longer 10977 defface spec has been applied. Thus, X resources are no longer
10978 overriden by the defface spec which also fixes issues on win32 where 10978 overridden by the defface spec which also fixes issues on win32 where
10979 the toolbar coloring was wrong because it is set through X resources 10979 the toolbar coloring was wrong because it is set through X resources
10980 and was (wrongfully) overriden. (Bug#16694) 10980 and was (wrongfully) overridden. (Bug#16694)
10981 10981
109822014-04-30 Stefan Monnier <monnier@iro.umontreal.ca> 109822014-04-30 Stefan Monnier <monnier@iro.umontreal.ca>
10983 10983
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."
268 268
269(defmacro cl-generic-define-context-rewriter (name args &rest body) 269(defmacro cl-generic-define-context-rewriter (name args &rest body)
270 "Define a special kind of context named NAME. 270 "Define a special kind of context named NAME.
271Whenever a context specializer of the form (NAME . ACTUALS) appears, 271Whenever a context specializer of the form (NAME . ARGS) appears,
272the specializer used will be the one returned by BODY." 272the specializer used will be the one returned by BODY."
273 (declare (debug (&define name lambda-list def-body)) (indent defun)) 273 (declare (debug (&define name lambda-list def-body)) (indent defun))
274 `(eval-and-compile 274 `(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."
390 390
391;; SOAP WSDL documents use XML Schema to define the types that are part of the 391;; SOAP WSDL documents use XML Schema to define the types that are part of the
392;; message exchange. We include here an XML schema model with a parser and 392;; message exchange. We include here an XML schema model with a parser and
393;; serializer/deserialiser. 393;; serializer/deserializer.
394 394
395(defstruct (soap-xs-type (:include soap-element)) 395(defstruct (soap-xs-type (:include soap-element))
396 id 396 id
@@ -710,7 +710,7 @@ This is a specialization of `soap-decode-type' for
710(defun soap-xs-element-type (element) 710(defun soap-xs-element-type (element)
711 "Retrieve the type of ELEMENT. 711 "Retrieve the type of ELEMENT.
712This is normally stored in the TYPE^ slot, but if this element 712This is normally stored in the TYPE^ slot, but if this element
713contains a reference, we retrive the type of the reference." 713contains a reference, retrieve the type of the reference."
714 (if (soap-xs-element-reference element) 714 (if (soap-xs-element-reference element)
715 (soap-xs-element-type (soap-xs-element-reference element)) 715 (soap-xs-element-type (soap-xs-element-reference element))
716 (soap-xs-element-type^ element))) 716 (soap-xs-element-type^ element)))
@@ -1989,7 +1989,7 @@ This is a specialization of `soap-decode-type' for
1989 ) 1989 )
1990 1990
1991(defun soap-make-wsdl (origin) 1991(defun soap-make-wsdl (origin)
1992 "Create a new WSDL document, loaded from ORIGIN, and intialize it." 1992 "Create a new WSDL document, loaded from ORIGIN, and initialize it."
1993 (let ((wsdl (soap-make-wsdl^ :origin origin))) 1993 (let ((wsdl (soap-make-wsdl^ :origin origin)))
1994 1994
1995 ;; Add the XSD types to the wsdl document 1995 ;; 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."
334 (insert "\t") 334 (insert "\t")
335 (soap-insert-describe-button type))) 335 (soap-insert-describe-button type)))
336 (when (soap-xs-simple-type-enumeration type) 336 (when (soap-xs-simple-type-enumeration type)
337 (insert "\nEnumeraton values: ") 337 (insert "\nEnumeration values: ")
338 (dolist (e (soap-xs-simple-type-enumeration type)) 338 (dolist (e (soap-xs-simple-type-enumeration type))
339 (insert "\n\t") 339 (insert "\n\t")
340 (pp e))) 340 (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
108file and everything else in the project. But in more advanced 108file and everything else in the project. But in more advanced
109configurations, a project can span multiple directories. 109configurations, a project can span multiple directories.
110 110
111The rule of tumb for whether to include a directory here, and not 111The rule of thumb for whether to include a directory here, and not
112in `project-library-roots', is whether its contents are meant to 112in `project-library-roots', is whether its contents are meant to
113be edited together with the rest of the project. 113be edited together with the rest of the project.
114 114
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."
2071;;;###autoload 2071;;;###autoload
2072(defun vc-message-unresolved-conflicts (filename) 2072(defun vc-message-unresolved-conflicts (filename)
2073 "Display a message indicating unresolved conflicts in FILENAME." 2073 "Display a message indicating unresolved conflicts in FILENAME."
2074 ;; This enables all VC backends to give a standard, recognizeable 2074 ;; This enables all VC backends to give a standard, recognizable
2075 ;; conflict message that indicates which file is conflicted. 2075 ;; conflict message that indicates which file is conflicted.
2076 (message "There are unresolved conflicts in %s" filename)) 2076 (message "There are unresolved conflicts in %s" filename))
2077 2077