aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-11-10 10:22:29 -0800
committerPaul Eggert2015-11-10 10:23:00 -0800
commitc92dbd6d0c234ff993acb0a095c024593bc185c8 (patch)
treef6e1be4508825d465244f4849e2ab33209d8cc84
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.
-rw-r--r--ChangeLog.24
-rw-r--r--doc/lispref/variables.texi2
-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
-rw-r--r--src/alloc.c2
-rw-r--r--src/nsterm.h4
-rw-r--r--src/nsterm.m14
-rw-r--r--src/window.c2
-rw-r--r--test/etags/cp-src/clheir.hpp2
13 files changed, 27 insertions, 27 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index a915adbd80c..3636e382eb2 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -612,7 +612,7 @@
612 612
6132015-10-29 Stefan Monnier <monnier@iro.umontreal.ca> 6132015-10-29 Stefan Monnier <monnier@iro.umontreal.ca>
614 614
615 * lisp/emacs-lisp/cl-generic.el: Accomodate future changes. 615 * lisp/emacs-lisp/cl-generic.el: Accommodate future changes.
616 (cl--generic-generalizer): Add `name' field. 616 (cl--generic-generalizer): Add `name' field.
617 (cl-generic-make-generalizer): Add corresponding `name' argument. 617 (cl-generic-make-generalizer): Add corresponding `name' argument.
618 (cl-generic-define-generalizer): New macro. 618 (cl-generic-define-generalizer): New macro.
@@ -4418,7 +4418,7 @@
44182015-09-20 Stefan Monnier <monnier@iro.umontreal.ca> 44182015-09-20 Stefan Monnier <monnier@iro.umontreal.ca>
4419 4419
4420 * lisp/progmodes/prolog.el: Improve handling of if/then/else. 4420 * lisp/progmodes/prolog.el: Improve handling of if/then/else.
4421 (prolog-smie-rules): Accomodate standard if/then/else special 4421 (prolog-smie-rules): Accommodate standard if/then/else special
4422 indentation. 4422 indentation.
4423 (prolog-mode): Add . to electric-indent-chars. 4423 (prolog-mode): Add . to electric-indent-chars.
4424 (prolog-electric--if-then-else): Re-indent the line before adding space 4424 (prolog-electric--if-then-else): Re-indent the line before adding space
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index f49d5062f20..5a2cae0f678 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1790,7 +1790,7 @@ specify different values for the same variable, the file sorted after
1790will override the value of the previous file (for instance, values in 1790will override the value of the previous file (for instance, values in
1791@file{.dir-locals2.el} override those in @file{.dir-locals.el}). Note 1791@file{.dir-locals2.el} override those in @file{.dir-locals.el}). Note
1792that, because of how lexicographic order works, values in 1792that, because of how lexicographic order works, values in
1793@file{.dir-locals10.el} are overriden by values in @file{.dir-locals2.el}. 1793@file{.dir-locals10.el} are overridden by values in @file{.dir-locals2.el}.
1794This can be avoided by using @file{.dir-locals02.el} instead. 1794This can be avoided by using @file{.dir-locals02.el} instead.
1795@end defvr 1795@end defvr
1796 1796
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
diff --git a/src/alloc.c b/src/alloc.c
index 81d644a16ad..bee7cd1758d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5346,7 +5346,7 @@ compact_font_cache_entry (Lisp_Object entry)
5346 } 5346 }
5347 if (CONSP (objlist)) 5347 if (CONSP (objlist))
5348 { 5348 {
5349 /* Foiund a marked font, bail out. */ 5349 /* Found a marked font, bail out. */
5350 break; 5350 break;
5351 } 5351 }
5352 } 5352 }
diff --git a/src/nsterm.h b/src/nsterm.h
index 3fb8cfc9cd8..1b330f08636 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -126,7 +126,7 @@ nsterm.m : 6718: [ 4453] | | | | +->> (X:0 Y:0)/(W:1600 H:1177)
126 126
127 Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls 127 Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls
128 "performZoom". This function calls "[super performZoom]", which 128 "performZoom". This function calls "[super performZoom]", which
129 isn't annoted (so it doesn't show up in the trace). However, it 129 isn't annotated (so it doesn't show up in the trace). However, it
130 calls "zoom" which is annotated so it is part of the call trace. 130 calls "zoom" which is annotated so it is part of the call trace.
131 Later, the method "windowWillUseStandardFrame" and the function 131 Later, the method "windowWillUseStandardFrame" and the function
132 "setFSValue" are called. The lines with "+---" contain extra 132 "setFSValue" are called. The lines with "+---" contain extra
@@ -230,7 +230,7 @@ void nstrace_leave(int *);
230 230
231/* Function enter macros. 231/* Function enter macros.
232 232
233 NSTRACE (fmt, ...) -- Enable trace output in curent block 233 NSTRACE (fmt, ...) -- Enable trace output in current block
234 (typically a function). Accepts printf-style 234 (typically a function). Accepts printf-style
235 arguments. 235 arguments.
236 236
diff --git a/src/nsterm.m b/src/nsterm.m
index fabfa2914a0..5e6c7484331 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6353,7 +6353,7 @@ not_in_argv (NSString *arg)
6353 6353
6354 /* Restrict the new size to the text gird. 6354 /* Restrict the new size to the text gird.
6355 6355
6356 Don't restict the width if the user only adjusted the height, and 6356 Don't restrict the width if the user only adjusted the height, and
6357 vice versa. (Without this, the frame would shrink, and move 6357 vice versa. (Without this, the frame would shrink, and move
6358 slightly, if the window was resized by dragging one of its 6358 slightly, if the window was resized by dragging one of its
6359 borders.) */ 6359 borders.) */
@@ -7591,7 +7591,7 @@ not_in_argv (NSString *arg)
7591/* Constrain size and placement of a frame. 7591/* Constrain size and placement of a frame.
7592 7592
7593 By returning the original "frameRect", the frame is not 7593 By returning the original "frameRect", the frame is not
7594 contrained. This can lead to unwanted situations where, for 7594 constrained. This can lead to unwanted situations where, for
7595 example, the menu bar covers the frame. 7595 example, the menu bar covers the frame.
7596 7596
7597 The default implementation (accessed using "super") constrains the 7597 The default implementation (accessed using "super") constrains the
@@ -7647,7 +7647,7 @@ not_in_argv (NSString *arg)
7647 7647
7648#if 0 7648#if 0
7649 // Native zoom done using the standard zoom animation. Size of the 7649 // Native zoom done using the standard zoom animation. Size of the
7650 // resulting frame reduced to accomodate the Dock and, if present, 7650 // resulting frame reduced to accommodate the Dock and, if present,
7651 // the menu-bar. 7651 // the menu-bar.
7652 [super zoom:sender]; 7652 [super zoom:sender];
7653 7653
@@ -7661,8 +7661,8 @@ not_in_argv (NSString *arg)
7661 // 7661 //
7662 // This works for all practical purposes. (The only minor oddity is 7662 // This works for all practical purposes. (The only minor oddity is
7663 // when transiting from full-height frame to a maximized, the 7663 // when transiting from full-height frame to a maximized, the
7664 // animation reduces the height of the frame slighty (to the 4 7664 // animation reduces the height of the frame slightly (to the 4
7665 // pixels needed to accomodate the Doc) before it snaps back into 7665 // pixels needed to accommodate the Doc) before it snaps back into
7666 // full height. The user would need a very trained eye to spot 7666 // full height. The user would need a very trained eye to spot
7667 // this.) 7667 // this.)
7668 NSScreen * screen = [self screen]; 7668 NSScreen * screen = [self screen];
@@ -7702,8 +7702,8 @@ not_in_argv (NSString *arg)
7702 } 7702 }
7703 } 7703 }
7704#else 7704#else
7705 // Non-native zoom which is done instantaneous. The resulting frame 7705 // Non-native zoom which is done instantaneously. The resulting frame
7706 // covert the entire scrren, except the menu-bar, if present. 7706 // covers the entire screen, except the menu-bar, if present.
7707 NSScreen * screen = [self screen]; 7707 NSScreen * screen = [self screen];
7708 if (screen != nil) 7708 if (screen != nil)
7709 { 7709 {
diff --git a/src/window.c b/src/window.c
index 7c95ff9b16f..0ac76d41861 100644
--- a/src/window.c
+++ b/src/window.c
@@ -210,7 +210,7 @@ wset_update_mode_line (struct window *w)
210{ 210{
211 /* If this window is the selected window on its frame, set the 211 /* If this window is the selected window on its frame, set the
212 global variable update_mode_lines, so that x_consider_frame_title 212 global variable update_mode_lines, so that x_consider_frame_title
213 will consider this frame's title for rtedisplay. */ 213 will consider this frame's title for redisplay. */
214 Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window; 214 Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window;
215 215
216 if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w) 216 if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w)
diff --git a/test/etags/cp-src/clheir.hpp b/test/etags/cp-src/clheir.hpp
index a9245637413..55d91228fb3 100644
--- a/test/etags/cp-src/clheir.hpp
+++ b/test/etags/cp-src/clheir.hpp
@@ -17,7 +17,7 @@ public:
17 generic_object(); // enter generic_object into ObjectRegistry 17 generic_object(); // enter generic_object into ObjectRegistry
18 // We never copy generic_objects, so we don't need a copy constructor. 18 // We never copy generic_objects, so we don't need a copy constructor.
19 ~generic_object(void); // delete from ObjectRegistry 19 ~generic_object(void); // delete from ObjectRegistry
20 // Simulation steps, accomodate different kinds of time 20 // Simulation steps, accommodate different kinds of time
21 virtual void compute_next_state(void) { } 21 virtual void compute_next_state(void) { }
22 virtual void step(void) { } 22 virtual void step(void) { }
23 }; 23 };