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
526e5233
Commit
526e5233
authored
Aug 15, 2013
by
Paul Eggert
Browse files
Spelling fixes.
parent
c8068af5
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
27 deletions
+27
-27
doc/lispref/display.texi
doc/lispref/display.texi
+1
-1
doc/misc/eieio.texi
doc/misc/eieio.texi
+1
-1
doc/misc/todo-mode.texi
doc/misc/todo-mode.texi
+11
-11
etc/refcards/Makefile
etc/refcards/Makefile
+1
-1
lisp/desktop.el
lisp/desktop.el
+3
-3
lisp/frameset.el
lisp/frameset.el
+1
-1
lisp/progmodes/python.el
lisp/progmodes/python.el
+6
-6
src/decompress.c
src/decompress.c
+1
-1
src/image.c
src/image.c
+1
-1
src/process.c
src/process.c
+1
-1
No files found.
doc/lispref/display.texi
View file @
526e5233
...
...
@@ -4667,7 +4667,7 @@ the aspect ratio.
@item :format
ImageMagick tries to auto-detect the image type, but it isn't always
able to. By using @code{:format-type}, we can give ImageMagick a hint
to try to help it. It'
s
used
in
conjuction
with
the
to try to help it. It's used in conju
n
ction with the
@code{image-format-suffixes} variable, which provides a mapping from
content types to file name suffixes. This is then given to
ImageMagick as a file name hint.
...
...
doc/misc/eieio.texi
View file @
526e5233
...
...
@@ -256,7 +256,7 @@ concepts. Therefore, it is highly recommended to learn these from a
textbook or tutorial first, especially if you only know OOP from
languages like C++ or Java. If on the other hand you are already
familiar with CLOS, you should be aware that @eieio
{}
does not implement
the full CLOS specific
i
ation and also differs in some other aspects
the full CLOS specification and also differs in some other aspects
(@xref
{
Introduction
}
, and @ref
{
CLOS compatibility
}
).
A @dfn
{
class
}
is a definition for organizing data and methods
...
...
doc/misc/todo-mode.texi
View file @
526e5233
...
...
@@ -433,7 +433,7 @@ visiting any of these files, the command also rename them accordingly.
@item F k
Delete the current todo file (@code
{
todo-delete-file
}
).@footnote
{
The key
binding of this command is mne
nom
ic for ``kill'' to parallel the binding
binding of this command is mne
mon
ic for ``kill'' to parallel the binding
@kbd
{
k
}
for item deletion, since @kbd
{
d
}
is bound to another item
editing command (@pxref
{
Done Items
}
).
}
If the todo file has an archive
(@pxref
{
Todo Archive Mode
}
), prompt whether to delete that as well.
...
...
@@ -496,7 +496,7 @@ and adds the category.
@item C k
Delete the current category (@code
{
todo-delete-category
}
).@footnote
{
This
binding is mne
nom
ic for ``kill'' to parallel the binding @kbd
{
k
}
for
binding is mne
mon
ic for ``kill'' to parallel the binding @kbd
{
k
}
for
item deletion, since @kbd
{
d
}
is bound to another item editing command
(@pxref
{
Done Items
}
).
}
To delete a category that contains items, you
have to confirm your intent; if the category is empty, deletion is
...
...
@@ -595,7 +595,7 @@ concerning the item header, and one each concerning its priority and its
text. Each unique combination of these parameters produces a different
insertion command. The command @kbd
{
i i
}
realizes one of these
combinations. For the commands that realize the remaining combinations
it is convenient to associate each parameter with a mne
nom
ically chosen
it is convenient to associate each parameter with a mne
mon
ically chosen
key. Then by typing certain sequences of these keys, you complete the
insertion command invocation that realizes the specified combination.
As with @kbd
{
i i
}
, the effect of many of these commands also depends on
...
...
@@ -610,7 +610,7 @@ occur in a category listing):
@enumerate
@item
@kbd
{
y
}
for diary (non)inclusion;
@kbd
{
y
}
for diary (non)inclusion;
@item
@kbd
{
k
}
for adding or omitting `diary-nonmarking-symbol';
@item
...
...
@@ -882,7 +882,7 @@ You delete an item, thereby permanently removing it:
@item k
Delete the todo item at point (@code
{
todo-delete-item
}
; the binding is
mne
nom
ic for ``kill'', since @kbd
{
d
}
is used for marking items as done
mne
mon
ic for ``kill'', since @kbd
{
d
}
is used for marking items as done
(@pxref
{
Done Items
}
); but note that @kbd
{
k
}
does not put the item into
the kill ring). This command requires confirmation that you want to
delete the item, since you cannot undo the deletion in Todo mode. (You
...
...
@@ -1170,7 +1170,7 @@ listed consecutively en bloc.
You can mark both todo and done items, but note that only @kbd
{
m
}
can apply
to both; other commands only affect either marked todo or marked done
items, so if both types of items are marked, invoking these comm
m
ands
items, so if both types of items are marked, invoking these commands
has no effect and informs you of your erroneous attempt.
@node Todo Categories Mode, Searching for Items, Marked Items, Top
...
...
@@ -1214,7 +1214,7 @@ to visit another todo file). To do this customize the option
@node Table of Item Counts, Reordering Categories, , Todo Categories Mode
@section Table of Item Counts
Above each column of the table is a label
l
ed button you can press by
Above each column of the table is a labeled button you can press by
clicking with the mouse or by typing @key
{
RET
}
on it. Pressing an item
count button sorts the table alternately in ascending or descending
order according to the type of count. Pressing the category button
...
...
@@ -1375,7 +1375,7 @@ filter come in pairs, one for filtering just the current todo file and
one for filtering a user-specified list of todo files. Thus, there
are six item filtering commands:@footnote
{
The use of @kbd
{
F
}
in the key
sequences of these commands naturally recalls ``filter'', but is also
consistent with the Todo mode mne
nom
ic key binding convention, since the
consistent with the Todo mode mne
mon
ic key binding convention, since the
commands involve one or more whole files.
}
@itemize @bullet
...
...
@@ -1533,7 +1533,7 @@ completion (@code{todo-find-filtered-items-file}).
@end table
@itemize @bullet
@item
@item
As with tables of categories, by customizing @code
{
todo-show-first
}
you
can have the first invocation of @code
{
todo-show
}
for a given todo file
display the corresponding saved file of filtered items. If there is
...
...
@@ -1548,7 +1548,7 @@ Filtered Items mode. It deletes the current filtered items file.
@node Todo Display Features, Printing Todo Buffers, Todo Filtered Items Mode, Top
@chapter Todo Display Features
You can change the appearance of Todo mode buffers in a variety of ways.
You can change the appearance of Todo mode buffers in a variety of ways.
@menu
* Faces::
...
...
@@ -1567,7 +1567,7 @@ the date and time of a Todo diary item (i.e., an item lacking
@code
{
todo-nondiary-marker
}
) is earlier than the current date and time,
they are displayed in a different face. In this way, you can readily
recognize diary items that have ``expired'' and act accordingly (e.g.,
by tagging them as done or by updating the deadlines).
by tagging them as done or by updating the deadlines).
Another example of an informational face is the face used to distinguish
top priority items. A third case is the face used in Todo Categories
...
...
etc/refcards/Makefile
View file @
526e5233
...
...
@@ -152,7 +152,7 @@ make_cs=if pdfcsplain --version > /dev/null 2> /dev/null; then \
## A4, landscape: de-refcard, fr-refcard, pt-br-refcard orgcard
## A4, portrait: cs-*, fr-dired-ref, sk-*, pl-refcard, ru-refcard
## Letter, landscape: calccard, refcard
## Letter, portrait (suffix rule): dire
f
-ref, gnus-*, survival, vip*
## Letter, portrait (suffix rule): dire
d
-ref, gnus-*, survival, vip*
calccard_deps
=
calccard.tex emacsver.tex pdflayout.sty
calccard.pdf
:
$(calccard_deps)
...
...
lisp/desktop.el
View file @
526e5233
...
...
@@ -390,7 +390,7 @@ If `delete', frames on other displays are deleted instead of restored."
(
defcustom
desktop-restore-forces-onscreen
t
"If t, offscreen frames are restored onscreen instead.
If `:all', frames that are partially offscreen are also forced onscren.
If `:all', frames that are partially offscreen are also forced onscre
e
n.
NOTE: Checking of frame boundaries is only approximate and can fail
to reliably detect frames whose onscreen/offscreen state depends on a
few pixels, especially near the right / bottom borders of the screen."
...
...
@@ -670,7 +670,7 @@ if different)."
;; which already takes care of frame restoration and deletion.
(
called-interactively-p
'any
))
(
let*
((
this
(
selected-frame
))
(
mini
(
window-frame
(
minibuffer-window
this
))))
; in case they difer
(
mini
(
window-frame
(
minibuffer-window
this
))))
; in case they dif
f
er
(
dolist
(
frame
(
sort
(
frame-list
)
#'
frameset-minibufferless-first-p
))
(
condition-case
err
(
unless
(
or
(
eq
frame
this
)
...
...
@@ -1032,7 +1032,7 @@ being set (usually, by reading it from the desktop)."
:force-onscreen
desktop-restore-forces-onscreen
)))
;; Just to silence the byte compiler.
;; Dynamicaly bound in `desktop-read'.
;; Dynamical
l
y bound in `desktop-read'.
(
defvar
desktop-first-buffer
)
(
defvar
desktop-buffer-ok-count
)
(
defvar
desktop-buffer-fail-count
)
...
...
lisp/frameset.el
View file @
526e5233
...
...
@@ -182,7 +182,7 @@ Properties can be set with
;; Let's say that Emacs' frame parameters were never designed as a tool to
;; precisely record (or restore) a frame's state. They grew organically,
;; and their uses and behaviors reflect their history. In using them to
;; implement framesets, the unwary implement
o
r, or the prospective package
;; implement framesets, the unwary implement
e
r, or the prospective package
;; writer willing to use framesets in their code, might fall victim of some
;; unexpected... oddities.
;;
...
...
lisp/progmodes/python.el
View file @
526e5233
...
...
@@ -3080,14 +3080,14 @@ not be passed explicitly unless you know what you are doing."
min-indent
indent
(if (<= indent children-indent-limit)
;; This l
ay
s within the children indent offset range,
;; so it's a normal child
ren
of its parent (i.e., not
;; a child
ren
of a child
ren
).
;; This l
ie
s within the children indent offset range,
;; so it's a normal child of its parent (i.e., not
;; a child of a child).
(cons (cons label pos) tree)
;; Oh no
es
, a child
ren
of a child
ren
?!
.
Fear not, we
;; know how to roll. We recursely parse these by
;; Oh no, a child of a child?!
Fear not, we
;; know how to roll.
We recurs
iv
ely parse these by
;; swapping prev-indent and min-indent plus adding this
;; newly found item to a fresh subtree. This works, I
;; newly found item to a fresh subtree.
This works, I
;; promise.
(cons
(python-imenu--build-tree
...
...
src/decompress.c
View file @
526e5233
...
...
@@ -164,7 +164,7 @@ This function can be called only in unibyte buffers. */)
stream
.
avail_in
=
0
;
stream
.
next_in
=
Z_NULL
;
/* The magic number 32 apparently means "autodect both the gzip and
/* The magic number 32 apparently means "autode
te
ct both the gzip and
zlib formats" according to zlib.h. */
if
(
fn_inflateInit2
(
&
stream
,
MAX_WBITS
+
32
)
!=
Z_OK
)
return
Qnil
;
...
...
src/image.c
View file @
526e5233
...
...
@@ -7934,7 +7934,7 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
return NULL;
}
/* The sub-image may not start at orig
o
, so move the destination
/* The sub-image may not start at orig
in
, so move the destination
iterator to where the sub-image should start. */
if (source_top > 0)
{
...
...
src/process.c
View file @
526e5233
...
...
@@ -1893,7 +1893,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
#ifndef WINDOWSNT
/* Wait for child_setup to complete in case that vfork is
actually defined as fork. The descriptor
XPROCESS (proc)->open_fd[EXEC_MO
I
NTOR_OUTPUT]
XPROCESS (proc)->open_fd[EXEC_MON
I
TOR_OUTPUT]
of a pipe is closed at the child side either by close-on-exec
on successful execve or the _exit call in child_setup. */
{
...
...
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