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
73349822
Commit
73349822
authored
Dec 22, 2016
by
Paul Eggert
Browse files
; Spelling fixes
parent
b10bd719
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
34 additions
and
36 deletions
+34
-36
ChangeLog.2
ChangeLog.2
+1
-1
doc/lispref/streams.texi
doc/lispref/streams.texi
+1
-1
doc/lispref/variables.texi
doc/lispref/variables.texi
+1
-1
etc/NEWS
etc/NEWS
+1
-1
lisp/bookmark.el
lisp/bookmark.el
+1
-1
lisp/cedet/semantic/db-global.el
lisp/cedet/semantic/db-global.el
+1
-1
lisp/image-dired.el
lisp/image-dired.el
+4
-4
lisp/vc/diff-mode.el
lisp/vc/diff-mode.el
+1
-1
lisp/vc/ediff-init.el
lisp/vc/ediff-init.el
+1
-1
lisp/vc/ediff-ptch.el
lisp/vc/ediff-ptch.el
+4
-4
src/ChangeLog.13
src/ChangeLog.13
+1
-1
src/ChangeLog.3
src/ChangeLog.3
+1
-1
src/process.c
src/process.c
+5
-6
src/systhread.c
src/systhread.c
+1
-1
src/thread.c
src/thread.c
+5
-6
src/thread.h
src/thread.h
+2
-2
test/lisp/net/tramp-tests.el
test/lisp/net/tramp-tests.el
+1
-1
test/lisp/vc/vc-tests.el
test/lisp/vc/vc-tests.el
+1
-1
test/src/thread-tests.el
test/src/thread-tests.el
+1
-1
No files found.
ChangeLog.2
View file @
73349822
...
...
@@ -26205,7 +26205,7 @@
2015-08-07 Phillip Lord <phillip.lord@newcastle.ac.uk>
Improve error signal
l
ing for seq-subseq
Improve error signaling for seq-subseq
* lisp/emacs-lisp/seq.el (seq-subseq): The existing behavior is to error
when indexes are too large, but to silently ignore numbers which
are too negative for lists. String and vector handling errors in
doc/lispref/streams.texi
View file @
73349822
...
...
@@ -639,7 +639,7 @@ spacing between calls.
This function outputs a newline to @var{stream}. The name stands for
``terminate print''. If @var{ensure} is non-@code{nil} no newline is printed
if @var{stream} is already at the beginning of a line. Note in this
case @var{stream} can not be a function and an error is signal
l
ed if
case @var{stream} can not be a function and an error is signaled if
it is. This function returns @code{t} if a newline is printed.
@end defun
...
...
doc/lispref/variables.texi
View file @
73349822
...
...
@@ -809,7 +809,7 @@ functions.
@subsection Limitations
There are a couple of ways in which a variable could be modifed (or at
There are a couple of ways in which a variable could be modif
i
ed (or at
least appear to be modified) without triggering a watchpoint.
Since watchpoints are attached to symbols, modification to the
...
...
etc/NEWS
View file @
73349822
...
...
@@ -512,7 +512,7 @@ instead of shell command strings. This change affects
'image-dired-cmd-pngnq-options', 'image-dired-cmd-pngcrush-options',
'image-dired-cmd-create-standard-thumbnail-options'
*** Recognizes more tools by default, including pngnq-s9,
o
pti
png
, and gm
*** Recognizes more tools by default, including pngnq-s9,
O
pti
PNG
, and gm
*** 'find-file' and related commands now work on thumbnails and
displayed images, providing a default argument of the original file name
...
...
lisp/bookmark.el
View file @
73349822
...
...
@@ -2123,7 +2123,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
(
current-buffer
))))
(
read-string
"Pattern: "
)
(
when
timer
(
cancel-timer
timer
)
(
setq
timer
nil
)))
(
when
timer
;; Signal
l
ed an error or a `quit'.
(
when
timer
;; Signaled an error or a `quit'.
(
cancel-timer
timer
)
(
bookmark-bmenu-list
)
(
bookmark-bmenu-goto-bookmark
bmk
)))))
...
...
lisp/cedet/semantic/db-global.el
View file @
73349822
...
...
@@ -47,7 +47,7 @@ in a GNU Global supported hierarchy.
Two sanity checks are performed to assure (a) that GNU global program exists
and (b) that the GNU global program version is compatibility with the database
version. If optional NOERROR is nil, then an error may be signal
l
ed on version
version. If optional NOERROR is nil, then an error may be signaled on version
mismatch. If NOERROR is not nil, then no error will be signaled. Instead
return value will indicate success or failure with non-nil or nil respective
values."
...
...
lisp/image-dired.el
View file @
73349822
...
...
@@ -262,7 +262,7 @@ is replaced by the file name of the temporary file."
(
executable-find
"pngnq-s9"
))
"The file name of the `pngnq' program.
It quantizes colors of PNG images down to 256 colors or fewer
using the Neu
q
uant
procedure
."
using the Neu
Q
uant
algorithm
."
:version
"26.1"
:type
'
(
choice
(
const
:tag
"Not Set"
nil
)
file
)
:group
'image-dired
)
...
...
@@ -702,7 +702,7 @@ Increase at own risk.")
process
))
(
defun
image-dired-pngcrush-thumb
(
spec
)
"Optimize thumbnail de
c
sribed by format SPEC with pngcrush(1)."
"Optimize thumbnail des
c
ribed by format SPEC with pngcrush(1)."
;; If pngnq wasn't run, then the THUMB-nq8.png file does not exist.
;; pngcrush needs an infile and outfile, so we just copy THUMB to
;; THUMB-nq8.png and use the latter as a temp file.
...
...
@@ -727,7 +727,7 @@ Increase at own risk.")
process
))
(
defun
image-dired-optipng-thumb
(
spec
)
"Optimize thumbnail de
c
sribed by format SPEC with optipng(1)."
"Optimize thumbnail des
c
ribed by format SPEC with optipng(1)."
(
let
((
process
(
apply
#'
start-process
"image-dired-optipng"
nil
image-dired-cmd-optipng-program
...
...
@@ -765,7 +765,7 @@ Increase at own risk.")
(
make-directory
thumbnail-dir
t
)
(
set-file-modes
thumbnail-dir
#o700
))
;; Thumbnail file creation processes begin here and are marshal
l
ed
;; Thumbnail file creation processes begin here and are marshaled
;; in a queue by `image-dired-create-thumb'.
(
setq
process
(
apply
#'
start-process
"image-dired-create-thumbnail"
nil
...
...
lisp/vc/diff-mode.el
View file @
73349822
...
...
@@ -1884,7 +1884,7 @@ With a prefix argument, REVERSE the hunk."
;; Advance to the next hunk with skip-hunk-start set to t
;; because we want the behavior of moving to the next logical
;; hunk, not the original behavior where were would sometimes
;; stay on the curent hunk. This is the behavior we get when
;; stay on the cur
r
ent hunk. This is the behavior we get when
;; navigating through hunks interactively, and we want it when
;; applying hunks too (see http://debbugs.gnu.org/17544).
(
when
diff-advance-after-apply-hunk
...
...
lisp/vc/ediff-init.el
View file @
73349822
...
...
@@ -318,7 +318,7 @@ It needs to be killed when we quit the session.")
(
defsubst
ediff-patch-metajob
(
&optional
metajob
)
(
memq
(
or
metajob
ediff-metajob-name
)
'
(
ediff-multifile-patch
)))
;; metajob involving only one group of files, such as multipatch or directory
;; metajob involving only one group of files, such as multi
-
patch or directory
;; revision
(
defsubst
ediff-one-filegroup-metajob
(
&optional
metajob
)
(
or
(
ediff-revision-metajob
metajob
)
...
...
lisp/vc/ediff-ptch.el
View file @
73349822
...
...
@@ -431,15 +431,15 @@ Please advise:
(
f2-exists
(
setcar
session-file-object
file2
))
(
f1-exists
(
setcar
session-file-object
file1
))
(
t
;; TODO: Often for multipaches the file doesn't exist
because the
;; directory part is wrong; for instance, if the
patch need to
;; be applied into
;; TODO: Often for multi
-
pa
t
ches the file doesn't exist
;;
because the
directory part is wrong; for instance, if the
;;
patch needs to
be applied into
;; (expand-file-name "lisp/vc/ediff-ptch.el" source-directory)
;; and default-directory is
;; (expand-file-name "lisp" source-directory)
;; then Ediff assumes the wrong file:
;; (expand-file-name "lisp/ediff-ptch.el" source-directory).
;; We might identify these common fail
o
ures and suggest
;; We might identify these common failures and suggest
;; in the prompt the possible corrected file. --Tino
(
with-output-to-temp-buffer
ediff-msg-buffer
(
ediff-with-current-buffer
standard-output
...
...
src/ChangeLog.13
View file @
73349822
...
...
@@ -17073,7 +17073,7 @@
2013-05-04 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuf.c (Fread_minibuffer, Feval_minibuffer): Move to Elisp.
(syms_of_minibuf): Adjust accodingly.
(syms_of_minibuf): Adjust acco
r
dingly.
* lread.c (Fread):
* callint.c (Fcall_interactively): Adjust calls accordingly.
...
...
src/ChangeLog.3
View file @
73349822
...
...
@@ -11648,7 +11648,7 @@
* fileio.c (Fcopy_file): Always close descriptors.
* s-sunos4.h: read, write, open and close are interrupt
a
ble.
* s-sunos4.h: read, write, open and close are interrupt
i
ble.
1991-01-09 Jim Blandy (jimb@churchy.ai.mit.edu)
...
...
src/process.c
View file @
73349822
...
...
@@ -4557,23 +4557,22 @@ from PROCESS only, suspending reading output from other processes.
If JUST-THIS-ONE is an integer, don't run any timers either.
Return non-nil if we received any output from PROCESS (or, if PROCESS
is nil, from any process) before the timeout expired. */)
(register Lisp_Object process, Lisp_Object seconds, Lisp_Object millisec, Lisp_Object just_this_one)
(Lisp_Object process, Lisp_Object seconds, Lisp_Object millisec,
Lisp_Object just_this_one)
{
intmax_t secs;
int nsecs;
if (! NILP (process))
{
struct Lisp_Process *procp;
CHECK_PROCESS (process);
proc
p
= XPROCESS (process);
struct Lisp_Process *
proc = XPROCESS (process);
/* Can't wait for a process that is dedicated to a different
thread. */
if (!EQ (proc
p
->thread, Qnil) && !EQ (proc
p
->thread, Fcurrent_thread ()))
if (!EQ (proc->thread, Qnil) && !EQ (proc->thread, Fcurrent_thread ()))
error ("Attempt to accept output from process %s locked to thread %s",
SDATA (proc
p
->name), SDATA (XTHREAD (proc
p
->thread)->name));
SDATA (proc->name), SDATA (XTHREAD (proc->thread)->name));
}
else
just_this_one = Qnil;
...
...
src/systhread.c
View file @
73349822
...
...
@@ -219,7 +219,7 @@ void
sys_mutex_lock
(
sys_mutex_t
*
mutex
)
{
/* FIXME: What happens if the owning thread exits without releasing
the mutex? Accoding to MSDN, the result is undefined behavior. */
the mutex? Acco
r
ding to MSDN, the result is undefined behavior. */
EnterCriticalSection
((
LPCRITICAL_SECTION
)
mutex
);
}
...
...
src/thread.c
View file @
73349822
...
...
@@ -257,7 +257,7 @@ If the current thread already owns MUTEX, increment the count and
return.
Otherwise, if no thread owns MUTEX, make the current thread own it.
Otherwise, block until MUTEX is available, or until the current thread
is signal
l
ed using `thread-signal'.
is signaled using `thread-signal'.
Note that calls to `mutex-lock' and `mutex-unlock' must be paired. */
)
(
Lisp_Object
mutex
)
{
...
...
@@ -363,8 +363,7 @@ condition_wait_callback (void *arg)
XSETCONDVAR
(
cond
,
cvar
);
self
->
event_object
=
cond
;
saved_count
=
lisp_mutex_unlock_for_wait
(
&
mutex
->
mutex
);
/* If we were signalled while unlocking, we skip the wait, but we
still must reacquire our lock. */
/* If signaled while unlocking, skip the wait but reacquire the lock. */
if
(
NILP
(
self
->
error_symbol
))
{
self
->
wait_condvar
=
&
cvar
->
cond
;
...
...
@@ -384,7 +383,7 @@ The mutex associated with COND must be held when this is called.
It is an error if it is not held.
This releases the mutex and waits for COND to be notified or for
this thread to be signal
l
ed with `thread-signal'. When
this thread to be signaled with `thread-signal'. When
`condition-wait' returns, COND's mutex will again be locked by
this thread. */
)
(
Lisp_Object
cond
)
...
...
@@ -404,7 +403,7 @@ this thread. */)
return
Qnil
;
}
/* Used to communicate argum
n
ets to condition_notify_callback. */
/* Used to communicate argume
n
ts to condition_notify_callback. */
struct
notify_args
{
struct
Lisp_CondVar
*
cvar
;
...
...
@@ -814,7 +813,7 @@ or `thread-join' in the target thread. */)
if
(
tstate
==
current_thread
)
Fsignal
(
error_symbol
,
data
);
/* What to do if thread is already signal
l
ed? */
/* What to do if thread is already signaled? */
/* What if error_symbol is Qnil? */
tstate
->
error_symbol
=
error_symbol
;
tstate
->
error_data
=
data
;
...
...
src/thread.h
View file @
73349822
...
...
@@ -48,7 +48,7 @@ struct thread_state
/* The thread's function. */
Lisp_Object
function
;
/* If non-nil, this thread has been signal
l
ed. */
/* If non-nil, this thread has been signaled. */
Lisp_Object
error_symbol
;
Lisp_Object
error_data
;
...
...
@@ -60,7 +60,7 @@ struct thread_state
/* A list of currently active byte-code execution value stacks.
Fbyte_code adds an entry to the head of this list before it starts
processing byte-code, and it removed the entry again when it is
done. Signal
l
ing an error truncates the list. */
done. Signaling an error truncates the list. */
struct
byte_stack
*
m_byte_stack_list
;
#define byte_stack_list (current_thread->m_byte_stack_list)
...
...
test/lisp/net/tramp-tests.el
View file @
73349822
...
...
@@ -2138,7 +2138,7 @@ This does not support special file names."
(
defun
tramp--test-windows-nt-and-batch
()
"Check, whether the locale host runs MS Windows in batch mode.
This does not support s
c
pecial characters."
This does not support special characters."
(
and
(
eq
system-type
'windows-nt
)
noninteractive
))
(
defun
tramp--test-windows-nt-and-pscp-psftp-p
()
...
...
test/lisp/vc/vc-tests.el
View file @
73349822
...
...
@@ -206,7 +206,7 @@ For backends which dont support it, it is emulated."
;; FIXME: Why isn't there `vc-unregister'?
(
defun
vc-test--unregister-function
(
backend
file
)
"Run the `vc-unregister' backend function.
For backends which don't support it, `vc-not-supported' is signal
l
ed."
For backends which don't support it, `vc-not-supported' is signaled."
;; CVS, SVN, SCCS, SRC and Mtn are not supported, and will signal
;; `vc-not-supported'.
(
prog1
...
...
test/src/thread-tests.el
View file @
73349822
...
...
@@ -153,7 +153,7 @@
(
mutex-lock
threads-mutex
))
(
ert-deftest
threads-mutex-signal
()
"test signal
l
ing a blocked thread"
"test signaling a blocked thread"
(
should
(
progn
(
setq
threads-mutex
(
make-mutex
))
...
...
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