Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c92dbd6d
Commit
c92dbd6d
authored
Nov 10, 2015
by
Paul Eggert
Browse files
Spelling fixes
* lisp/net/soap-inspect.el (soap-inspect-xs-simple-type): Fix misspelling in output.
parent
d149ca81
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
27 additions
and
27 deletions
+27
-27
ChangeLog.2
ChangeLog.2
+2
-2
doc/lispref/variables.texi
doc/lispref/variables.texi
+1
-1
lisp/ChangeLog.17
lisp/ChangeLog.17
+5
-5
lisp/emacs-lisp/cl-generic.el
lisp/emacs-lisp/cl-generic.el
+1
-1
lisp/net/soap-client.el
lisp/net/soap-client.el
+3
-3
lisp/net/soap-inspect.el
lisp/net/soap-inspect.el
+1
-1
lisp/progmodes/project.el
lisp/progmodes/project.el
+1
-1
lisp/vc/vc.el
lisp/vc/vc.el
+1
-1
src/alloc.c
src/alloc.c
+1
-1
src/nsterm.h
src/nsterm.h
+2
-2
src/nsterm.m
src/nsterm.m
+7
-7
src/window.c
src/window.c
+1
-1
test/etags/cp-src/clheir.hpp
test/etags/cp-src/clheir.hpp
+1
-1
No files found.
ChangeLog.2
View file @
c92dbd6d
...
@@ -612,7 +612,7 @@
...
@@ -612,7 +612,7 @@
2015-10-29 Stefan Monnier <monnier@iro.umontreal.ca>
2015-10-29 Stefan Monnier <monnier@iro.umontreal.ca>
* lisp/emacs-lisp/cl-generic.el: Accomodate future changes.
* lisp/emacs-lisp/cl-generic.el: Accom
m
odate future changes.
(cl--generic-generalizer): Add `name' field.
(cl--generic-generalizer): Add `name' field.
(cl-generic-make-generalizer): Add corresponding `name' argument.
(cl-generic-make-generalizer): Add corresponding `name' argument.
(cl-generic-define-generalizer): New macro.
(cl-generic-define-generalizer): New macro.
...
@@ -4418,7 +4418,7 @@
...
@@ -4418,7 +4418,7 @@
2015-09-20 Stefan Monnier <monnier@iro.umontreal.ca>
2015-09-20 Stefan Monnier <monnier@iro.umontreal.ca>
* lisp/progmodes/prolog.el: Improve handling of if/then/else.
* lisp/progmodes/prolog.el: Improve handling of if/then/else.
(prolog-smie-rules): Accomodate standard if/then/else special
(prolog-smie-rules): Accom
m
odate standard if/then/else special
indentation.
indentation.
(prolog-mode): Add . to electric-indent-chars.
(prolog-mode): Add . to electric-indent-chars.
(prolog-electric--if-then-else): Re-indent the line before adding space
(prolog-electric--if-then-else): Re-indent the line before adding space
...
...
doc/lispref/variables.texi
View file @
c92dbd6d
...
@@ -1790,7 +1790,7 @@ specify different values for the same variable, the file sorted after
...
@@ -1790,7 +1790,7 @@ specify different values for the same variable, the file sorted after
will override the value of the previous file (for instance, values in
will override the value of the previous file (for instance, values in
@file{.dir-locals2.el} override those in @file{.dir-locals.el}). Note
@file{.dir-locals2.el} override those in @file{.dir-locals.el}). Note
that, because of how lexicographic order works, values in
that, because of how lexicographic order works, values in
@file{.dir-locals10.el} are overriden by values in @file{.dir-locals2.el}.
@file{.dir-locals10.el} are overrid
d
en by values in @file{.dir-locals2.el}.
This can be avoided by using @file{.dir-locals02.el} instead.
This can be avoided by using @file{.dir-locals02.el} instead.
@end defvr
@end defvr
...
...
lisp/ChangeLog.17
View file @
c92dbd6d
...
@@ -4146,7 +4146,7 @@
...
@@ -4146,7 +4146,7 @@
2014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change)
2014-12-14 Steve Purcell <steve@sanityinc.com> (tiny change)
* emacs-lisp/package.el (package-menu-mode): Use an extra column
* 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 accom
m
odate date-and-time-based versions.
2014-12-14 Cameron Desautels <camdez@gmail.com>
2014-12-14 Cameron Desautels <camdez@gmail.com>
...
@@ -8700,9 +8700,9 @@
...
@@ -8700,9 +8700,9 @@
(python-shell-prompt-detect)
(python-shell-prompt-detect)
(python-shell-prompt-validate-regexps): New functions.
(python-shell-prompt-validate-regexps): New functions.
(python-shell-prompt-set-calculated-regexps): New function.
(python-shell-prompt-set-calculated-regexps): New function.
(inferior-python-mode): Use it. Also honor overriden
(inferior-python-mode): Use it. Also honor overrid
d
en
python-shell-interpreter and python-shell-interpreter-args.
python-shell-interpreter and python-shell-interpreter-args.
(python-shell-make-comint): Honor overriden
(python-shell-make-comint): Honor overrid
d
en
python-shell-interpreter and python-shell-interpreter-args.
python-shell-interpreter and python-shell-interpreter-args.
(python-shell-get-or-create-process): Make it testable by allowing
(python-shell-get-or-create-process): Make it testable by allowing
to call run-python non-interactively.
to call run-python non-interactively.
...
@@ -10975,9 +10975,9 @@
...
@@ -10975,9 +10975,9 @@
* faces.el (face-spec-recalc): Apply X resources only after the
* faces.el (face-spec-recalc): Apply X resources only after the
defface spec has been applied. Thus, X resources are no longer
defface spec has been applied. Thus, X resources are no longer
overriden by the defface spec which also fixes issues on win32 where
overrid
d
en by the defface spec which also fixes issues on win32 where
the toolbar coloring was wrong because it is set through X resources
the toolbar coloring was wrong because it is set through X resources
and was (wrongfully) overriden. (Bug#16694)
and was (wrongfully) overrid
d
en. (Bug#16694)
2014-04-30 Stefan Monnier <monnier@iro.umontreal.ca>
2014-04-30 Stefan Monnier <monnier@iro.umontreal.ca>
...
...
lisp/emacs-lisp/cl-generic.el
View file @
c92dbd6d
...
@@ -268,7 +268,7 @@ This macro can only be used within the lexical scope of a cl-generic method."
...
@@ -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
)
(
defmacro
cl-generic-define-context-rewriter
(
name
args
&rest
body
)
"Define a special kind of context named NAME.
"Define a special kind of context named NAME.
Whenever a context specializer of the form (NAME . A
CTUAL
S) appears,
Whenever a context specializer of the form (NAME . A
RG
S) appears,
the specializer used will be the one returned by BODY."
the specializer used will be the one returned by BODY."
(
declare
(
debug
(
&define
name
lambda-list
def-body
))
(
indent
defun
))
(
declare
(
debug
(
&define
name
lambda-list
def-body
))
(
indent
defun
))
`
(
eval-and-compile
`
(
eval-and-compile
...
...
lisp/net/soap-client.el
View file @
c92dbd6d
...
@@ -390,7 +390,7 @@ binding) but the same name."
...
@@ -390,7 +390,7 @@ binding) but the same name."
;; SOAP WSDL documents use XML Schema to define the types that are part of the
;; 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
;; message exchange. We include here an XML schema model with a parser and
;; serializer/deseriali
s
er.
;; serializer/deseriali
z
er.
(
defstruct
(
soap-xs-type
(
:include
soap-element
))
(
defstruct
(
soap-xs-type
(
:include
soap-element
))
id
id
...
@@ -710,7 +710,7 @@ This is a specialization of `soap-decode-type' for
...
@@ -710,7 +710,7 @@ This is a specialization of `soap-decode-type' for
(
defun
soap-xs-element-type
(
element
)
(
defun
soap-xs-element-type
(
element
)
"Retrieve the type of ELEMENT.
"Retrieve the type of ELEMENT.
This is normally stored in the TYPE^ slot, but if this 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, retri
e
ve the type of the reference."
(
if
(
soap-xs-element-reference
element
)
(
if
(
soap-xs-element-reference
element
)
(
soap-xs-element-type
(
soap-xs-element-reference
element
))
(
soap-xs-element-type
(
soap-xs-element-reference
element
))
(
soap-xs-element-type^
element
)))
(
soap-xs-element-type^
element
)))
...
@@ -1989,7 +1989,7 @@ This is a specialization of `soap-decode-type' for
...
@@ -1989,7 +1989,7 @@ This is a specialization of `soap-decode-type' for
)
)
(
defun
soap-make-wsdl
(
origin
)
(
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 in
i
tialize it."
(
let
((
wsdl
(
soap-make-wsdl^
:origin
origin
)))
(
let
((
wsdl
(
soap-make-wsdl^
:origin
origin
)))
;; Add the XSD types to the wsdl document
;; Add the XSD types to the wsdl document
...
...
lisp/net/soap-inspect.el
View file @
c92dbd6d
...
@@ -334,7 +334,7 @@ soap-xs-attribute-group, in the current buffer."
...
@@ -334,7 +334,7 @@ soap-xs-attribute-group, in the current buffer."
(
insert
"\t"
)
(
insert
"\t"
)
(
soap-insert-describe-button
type
)))
(
soap-insert-describe-button
type
)))
(
when
(
soap-xs-simple-type-enumeration
type
)
(
when
(
soap-xs-simple-type-enumeration
type
)
(
insert
"\nEnumeraton values: "
)
(
insert
"\nEnumerat
i
on values: "
)
(
dolist
(
e
(
soap-xs-simple-type-enumeration
type
))
(
dolist
(
e
(
soap-xs-simple-type-enumeration
type
))
(
insert
"\n\t"
)
(
insert
"\n\t"
)
(
pp
e
)))
(
pp
e
)))
...
...
lisp/progmodes/project.el
View file @
c92dbd6d
...
@@ -108,7 +108,7 @@ Most often it's just one directory, which contains the project
...
@@ -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
file and everything else in the project. But in more advanced
configurations, a project can span multiple directories.
configurations, a project can span multiple directories.
The rule of tumb for whether to include a directory here, and not
The rule of t
h
umb for whether to include a directory here, and not
in `project-library-roots', is whether its contents are meant to
in `project-library-roots', is whether its contents are meant to
be edited together with the rest of the project.
be edited together with the rest of the project.
...
...
lisp/vc/vc.el
View file @
c92dbd6d
...
@@ -2071,7 +2071,7 @@ changes from the current branch."
...
@@ -2071,7 +2071,7 @@ changes from the current branch."
;;;###autoload
;;;###autoload
(
defun
vc-message-unresolved-conflicts
(
filename
)
(
defun
vc-message-unresolved-conflicts
(
filename
)
"Display a message indicating unresolved conflicts in FILENAME."
"Display a message indicating unresolved conflicts in FILENAME."
;; This enables all VC backends to give a standard, recogniz
e
able
;; This enables all VC backends to give a standard, recognizable
;; conflict message that indicates which file is conflicted.
;; conflict message that indicates which file is conflicted.
(
message
"There are unresolved conflicts in %s"
filename
))
(
message
"There are unresolved conflicts in %s"
filename
))
...
...
src/alloc.c
View file @
c92dbd6d
...
@@ -5346,7 +5346,7 @@ compact_font_cache_entry (Lisp_Object entry)
...
@@ -5346,7 +5346,7 @@ compact_font_cache_entry (Lisp_Object entry)
}
}
if
(
CONSP
(
objlist
))
if
(
CONSP
(
objlist
))
{
{
/* Fo
i
und a marked font, bail out. */
/* Found a marked font, bail out. */
break
;
break
;
}
}
}
}
...
...
src/nsterm.h
View file @
c92dbd6d
...
@@ -126,7 +126,7 @@ nsterm.m : 6718: [ 4453] | | | | +->> (X:0 Y:0)/(W:1600 H:1177)
...
@@ -126,7 +126,7 @@ nsterm.m : 6718: [ 4453] | | | | +->> (X:0 Y:0)/(W:1600 H:1177)
Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls
Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls
"performZoom". This function calls "[super performZoom]", which
"performZoom". This function calls "[super performZoom]", which
isn't annoted (so it doesn't show up in the trace). However, it
isn't annot
at
ed (so it doesn't show up in the trace). However, it
calls "zoom" which is annotated so it is part of the call trace.
calls "zoom" which is annotated so it is part of the call trace.
Later, the method "windowWillUseStandardFrame" and the function
Later, the method "windowWillUseStandardFrame" and the function
"setFSValue" are called. The lines with "+---" contain extra
"setFSValue" are called. The lines with "+---" contain extra
...
@@ -230,7 +230,7 @@ void nstrace_leave(int *);
...
@@ -230,7 +230,7 @@ void nstrace_leave(int *);
/* Function enter macros.
/* Function enter macros.
NSTRACE (fmt, ...) -- Enable trace output in curent block
NSTRACE (fmt, ...) -- Enable trace output in cur
r
ent block
(typically a function). Accepts printf-style
(typically a function). Accepts printf-style
arguments.
arguments.
...
...
src/nsterm.m
View file @
c92dbd6d
...
@@ -6353,7 +6353,7 @@ - (NSSize)windowWillResize: (NSWindow *)sender toSize: (NSSize)frameSize
...
@@ -6353,7 +6353,7 @@ - (NSSize)windowWillResize: (NSWindow *)sender toSize: (NSSize)frameSize
/* Restrict the new size to the text gird.
/* Restrict the new size to the text gird.
Don't restict the width if the user only adjusted the height, and
Don't rest
r
ict the width if the user only adjusted the height, and
vice versa. (Without this, the frame would shrink, and move
vice versa. (Without this, the frame would shrink, and move
slightly, if the window was resized by dragging one of its
slightly, if the window was resized by dragging one of its
borders.) */
borders.) */
...
@@ -7591,7 +7591,7 @@ - (id)accessibilityAttributeValue:(NSString *)attribute
...
@@ -7591,7 +7591,7 @@ - (id)accessibilityAttributeValue:(NSString *)attribute
/* Constrain size and placement of a frame.
/* Constrain size and placement of a frame.
By returning the original "frameRect", the frame is not
By returning the original "frameRect", the frame is not
contrained. This can lead to unwanted situations where, for
con
s
trained. This can lead to unwanted situations where, for
example, the menu bar covers the frame.
example, the menu bar covers the frame.
The default implementation (accessed using "super") constrains the
The default implementation (accessed using "super") constrains the
...
@@ -7647,7 +7647,7 @@ - (void)zoom:(id)sender
...
@@ -7647,7 +7647,7 @@ - (void)zoom:(id)sender
#if 0
#if 0
// Native zoom done using the standard zoom animation. Size of the
// Native zoom done using the standard zoom animation. Size of the
// resulting frame reduced to accomodate the Dock and, if present,
// resulting frame reduced to accom
m
odate the Dock and, if present,
// the menu-bar.
// the menu-bar.
[super zoom:sender];
[super zoom:sender];
...
@@ -7661,8 +7661,8 @@ - (void)zoom:(id)sender
...
@@ -7661,8 +7661,8 @@ - (void)zoom:(id)sender
//
//
// This works for all practical purposes. (The only minor oddity is
// This works for all practical purposes. (The only minor oddity is
// when transiting from full-height frame to a maximized, the
// when transiting from full-height frame to a maximized, the
// animation reduces the height of the frame slighty (to the 4
// animation reduces the height of the frame slight
l
y (to the 4
// pixels needed to accomodate the Doc) before it snaps back into
// pixels needed to accom
m
odate the Doc) before it snaps back into
// full height. The user would need a very trained eye to spot
// full height. The user would need a very trained eye to spot
// this.)
// this.)
NSScreen * screen = [self screen];
NSScreen * screen = [self screen];
...
@@ -7702,8 +7702,8 @@ - (void)zoom:(id)sender
...
@@ -7702,8 +7702,8 @@ - (void)zoom:(id)sender
}
}
}
}
#else
#else
// Non-native zoom which is done instantaneous. The resulting frame
// Non-native zoom which is done instantaneous
ly
. The resulting frame
// cover
t
the entire scr
r
en, except the menu-bar, if present.
// cover
s
the entire scr
e
en, except the menu-bar, if present.
NSScreen * screen = [self screen];
NSScreen * screen = [self screen];
if (screen != nil)
if (screen != nil)
{
{
...
...
src/window.c
View file @
c92dbd6d
...
@@ -210,7 +210,7 @@ wset_update_mode_line (struct window *w)
...
@@ -210,7 +210,7 @@ wset_update_mode_line (struct window *w)
{
{
/* If this window is the selected window on its frame, set the
/* If this window is the selected window on its frame, set the
global variable update_mode_lines, so that x_consider_frame_title
global variable update_mode_lines, so that x_consider_frame_title
will consider this frame's title for r
t
edisplay. */
will consider this frame's title for redisplay. */
Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window;
Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window;
if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w)
if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w)
...
...
test/etags/cp-src/clheir.hpp
View file @
c92dbd6d
...
@@ -17,7 +17,7 @@ class generic_object
...
@@ -17,7 +17,7 @@ class generic_object
generic_object
();
// enter generic_object into ObjectRegistry
generic_object
();
// enter generic_object into ObjectRegistry
// We never copy generic_objects, so we don't need a copy constructor.
// We never copy generic_objects, so we don't need a copy constructor.
~
generic_object
(
void
);
// delete from ObjectRegistry
~
generic_object
(
void
);
// delete from ObjectRegistry
// Simulation steps, accomodate different kinds of time
// Simulation steps, accom
m
odate different kinds of time
virtual
void
compute_next_state
(
void
)
{
}
virtual
void
compute_next_state
(
void
)
{
}
virtual
void
step
(
void
)
{
}
virtual
void
step
(
void
)
{
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment