[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d5b70d8 3/5: Merge from origin/emacs-26
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] master d5b70d8 3/5: Merge from origin/emacs-26 |
|
Date: |
Thu, 18 Jan 2018 20:18:32 -0500 (EST) |
branch: master
commit d5b70d8330b35d5a344d57dc98029c2786c10ce3
Merge: fa39346 779b2ac
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
779b2ac Use recommended long options syntax in man page
c433e87 An overdue update of GNUstep emacs.tiff
188a9d9 Add some test skip conditions
---
doc/man/emacs.1.in | 50 +++++++--------
nextstep/GNUstep/Emacs.base/Resources/README | 5 +-
nextstep/GNUstep/Emacs.base/Resources/emacs.tiff | Bin 9464 -> 16751 bytes
test/lisp/vc/vc-bzr-tests.el | 6 +-
test/src/thread-tests.el | 76 ++++++++++++++++-------
5 files changed, 84 insertions(+), 53 deletions(-)
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in
index 7654c96..5116953 100644
--- a/doc/man/emacs.1.in
+++ b/doc/man/emacs.1.in
@@ -61,7 +61,7 @@ The following options are of general interest:
Edit
.IR file .
.TP
-.BI \-\-file " file\fR,\fP " \-\-find-file " file\fR,\fP " \-\-visit " file"
+.BI \-\-file= "file\fR,\fP " \-\-find-file= "file\fR,\fP " \-\-visit= "file"
The same as specifying
.I file
directly as an argument.
@@ -79,7 +79,7 @@ Go to the specified
and
.IR column .
.TP
-.BI \-\-chdir " directory"
+.BI \-\-chdir= "directory"
Change to
.IR directory .
.TP
@@ -112,12 +112,12 @@ Lisp debugger during the processing of the user init file
.BR ~/.emacs .
This is useful for debugging problems in the init file.
.TP
-.BI \-u " user\fR,\fP " \-\-user " user"
+.BI \-u " user\fR,\fP " \-\-user= "user"
Load
.IR user 's
init file.
.TP
-.BI \-t " file\fR,\fP " \-\-terminal " file"
+.BI \-t " file\fR,\fP " \-\-terminal= "file"
Use specified
.I file
as the terminal instead of using stdin/stdout.
@@ -144,15 +144,15 @@ The following options are Lisp-oriented
(these options are processed in the order encountered):
.RS
.TP 8
-.BI \-f " function\fR,\fP " \-\-funcall " function"
+.BI \-f " function\fR,\fP " \-\-funcall= "function"
Execute the lisp function
.IR function .
.TP
-.BI \-l " file\fR,\fP " \-\-load " file"
+.BI \-l " file\fR,\fP " \-\-load= "file"
Load the lisp code in the file
.IR file .
.TP
-.BI \-\-eval " expr\fR,\fP " \-\-execute " expr"
+.BI \-\-eval= "expr\fR,\fP " \-\-execute= "expr"
Evaluate the Lisp expression
.IR expr .
.RE
@@ -168,12 +168,12 @@ The editor will send messages to stderr.
You must use \-l and \-f options to specify files to execute
and functions to call.
.TP
-.BI \-\-script " file"
+.BI \-\-script= "file"
Run
.I file
as an Emacs Lisp script.
.TP
-.BI \-\-insert " file"
+.BI \-\-insert= "file"
Insert contents of
.I file
into the current buffer.
@@ -183,7 +183,7 @@ Exit
.I Emacs
while in batch mode.
.TP
-.BI \-L " dir\fR,\fP " \-\-directory " dir"
+.BI \-L " dir\fR,\fP " \-\-directory= "dir"
Add
.I dir
to the list of directories
@@ -206,13 +206,13 @@ process so that you can continue using your original
window.
can be started with the following X switches:
.RS
.TP 8
-.BI \-\-name " name"
+.BI \-\-name= "name"
Specify the name which should be assigned to the initial
.I Emacs
window.
This controls looking up X resources as well as the window title.
.TP
-.BI \-T " name\fR,\fP " \-\-title " name"
+.BI \-T " name\fR,\fP " \-\-title= "name"
Specify the title for the initial X window.
.TP
.BR \-r ", " \-rv ", " \-\-reverse\-video
@@ -220,7 +220,7 @@ Display the
.I Emacs
window in reverse video.
.TP
-.BI \-fn " font\fR,\fP " \-\-font " font"
+.BI \-fn " font\fR,\fP " \-\-font= "font"
Set the
.I Emacs
window's font to that specified by
@@ -247,7 +247,7 @@ for more information.
When you specify a font, be sure to put a space between the
switch and the font name.
.TP
-.BI \-\-xrm " resources"
+.BI \-\-xrm= "resources"
Set additional X resources.
.TP
.BI "\-\-color\fR,\fP \-\-color=" mode
@@ -256,20 +256,20 @@ Override color mode for character terminals;
defaults to "auto", and can also be "never", "auto", "always",
or a mode name like "ansi8".
.TP
-.BI \-bw " pixels\fR,\fP " \-\-border\-width " pixels"
+.BI \-bw " pixels\fR,\fP " \-\-border\-width= "pixels"
Set the
.I Emacs
window's border width to the number of pixels specified by
.IR pixels .
Defaults to one pixel on each side of the window.
.TP
-.BI \-ib " pixels\fR,\fP " \-\-internal\-border " pixels"
+.BI \-ib " pixels\fR,\fP " \-\-internal\-border= "pixels"
Set the window's internal border width to the number of pixels specified
by
.IR pixels .
Defaults to one pixel of padding on each side of the window.
.TP
-.BI \-g " geometry\fR,\fP " \-\-geometry " geometry"
+.BI \-g " geometry\fR,\fP " \-\-geometry= "geometry"
Set the
.I Emacs
window's width, height, and position as specified.
@@ -282,7 +282,7 @@ See the Emacs manual, section "Options for Window Size and
Position",
for information on how window sizes interact
with selecting or deselecting the tool bar and menu bar.
.TP
-.BI \-lsp " pixels\fR,\fP " \-\-line\-spacing " pixels"
+.BI \-lsp " pixels\fR,\fP " \-\-line\-spacing= "pixels"
Additional space to put between lines.
.TP
.BR \-vb ", " \-\-vertical\-scroll\-bars
@@ -300,26 +300,26 @@ Make the first frame as wide as the screen.
.BR \-mm ", " \-\-maximized
Maximize the first frame, like "\-fw \-fh".
.TP
-.BI \-fg " color\fR,\fP " \-\-foreground\-color " color"
+.BI \-fg " color\fR,\fP " \-\-foreground\-color= "color"
On color displays, set the color of the text.
Use the command
.I M\-x list\-colors\-display
for a list of valid color names.
.TP
-.BI \-bg " color\fR,\fP " \-\-background\-color " color"
+.BI \-bg " color\fR,\fP " \-\-background\-color= "color"
On color displays, set the color of the window's background.
.TP
-.BI \-bd " color\fR,\fP " \-\-border\-color " color"
+.BI \-bd " color\fR,\fP " \-\-border\-color= "color"
On color displays, set the color of the window's border.
.TP
-.BI \-cr " color\fR,\fP " \-\-cursor\-color " color"
+.BI \-cr " color\fR,\fP " \-\-cursor\-color= "color"
On color displays, set the color of the window's text cursor.
.TP
-.BI \-ms " color\fR,\fP " \-\-mouse\-color " color"
+.BI \-ms " color\fR,\fP " \-\-mouse\-color= "color"
On color displays, set the color of the window's mouse cursor.
.TP
-.BI \-d " displayname\fR,\fP " \-\-display " displayname"
+.BI \-d " displayname\fR,\fP " \-\-display= "displayname"
Create the
.I Emacs
window on the display specified by
@@ -337,7 +337,7 @@ in iconified state.
.BR \-nbc ", " \-\-no\-blinking\-cursor
Disable blinking cursor.
.TP
-.BI \-\-parent-id " xid"
+.BI \-\-parent-id= "xid"
Set parent window.
.TP
.BR \-nw ", " \-\-no\-window\-system
diff --git a/nextstep/GNUstep/Emacs.base/Resources/README
b/nextstep/GNUstep/Emacs.base/Resources/README
index 6b1e94b..4f80e00 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/README
+++ b/nextstep/GNUstep/Emacs.base/Resources/README
@@ -1,5 +1,6 @@
COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
File: emacs.tiff
- This is a version of the Emacs 23 icon (see etc/images/icons/README)
- by Kentaro Ohkouchi <address@hidden>.
+ Automatically converted from the Emacs 25 icon
+ etc/images/icons/hicolor/scalable/apps/emacs.svg
+ and subject to the same conditions.
diff --git a/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff
b/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff
index 42e89ce..29381ad 100644
Binary files a/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff and
b/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff differ
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index b3fbf33..6b96f3b 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -53,7 +53,8 @@
(insert (file-name-nondirectory ignored-dir))
(write-region nil nil (expand-file-name ".bzrignore" bzrdir)
nil 'silent))
- (call-process vc-bzr-program nil nil nil "init")
+ (skip-unless (eq 0 ; some internal bzr error
+ (call-process vc-bzr-program nil nil nil "init")))
(call-process vc-bzr-program nil nil nil "add")
(call-process vc-bzr-program nil nil nil "commit" "-m" "Commit 1")
(with-temp-buffer
@@ -84,7 +85,8 @@
process-environment)))
(unwind-protect
(progn
- (call-process vc-bzr-program nil nil nil "init")
+ (skip-unless (eq 0 ; some internal bzr error
+ (call-process vc-bzr-program nil nil nil "init")))
(make-directory subdir)
(with-temp-buffer
(insert "text")
diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el
index 244a516..0e909d3 100644
--- a/test/src/thread-tests.el
+++ b/test/src/thread-tests.el
@@ -20,29 +20,35 @@
;;; Code:
(ert-deftest threads-is-one ()
- "test for existence of a thread"
+ "Test for existence of a thread."
+ (skip-unless (fboundp 'make-thread))
(should (current-thread)))
(ert-deftest threads-threadp ()
- "test of threadp"
+ "Test of threadp."
+ (skip-unless (fboundp 'make-thread))
(should (threadp (current-thread))))
(ert-deftest threads-type ()
- "test of thread type"
+ "Test of thread type."
+ (skip-unless (fboundp 'make-thread))
(should (eq (type-of (current-thread)) 'thread)))
(ert-deftest threads-name ()
- "test for name of a thread"
+ "Test for name of a thread."
+ (skip-unless (fboundp 'make-thread))
(should
(string= "hi bob" (thread-name (make-thread #'ignore "hi bob")))))
(ert-deftest threads-alive ()
- "test for thread liveness"
+ "Test for thread liveness."
+ (skip-unless (fboundp 'make-thread))
(should
(thread-alive-p (make-thread #'ignore))))
(ert-deftest threads-all-threads ()
- "simple test for all-threads"
+ "Simple test for all-threads."
+ (skip-unless (fboundp 'make-thread))
(should (listp (all-threads))))
(defvar threads-test-global nil)
@@ -51,7 +57,8 @@
(setq threads-test-global 23))
(ert-deftest threads-basic ()
- "basic thread test"
+ "Basic thread test."
+ (skip-unless (fboundp 'make-thread))
(should
(progn
(setq threads-test-global nil)
@@ -61,7 +68,8 @@
threads-test-global)))
(ert-deftest threads-join ()
- "test of thread-join"
+ "Test of `thread-join'."
+ (skip-unless (fboundp 'make-thread))
(should
(progn
(setq threads-test-global nil)
@@ -71,7 +79,8 @@
(not (thread-alive-p thread)))))))
(ert-deftest threads-join-self ()
- "cannot thread-join the current thread"
+ "Cannot `thread-join' the current thread."
+ (skip-unless (fboundp 'make-thread))
(should-error (thread-join (current-thread))))
(defvar threads-test-binding nil)
@@ -82,7 +91,8 @@
(setq threads-test-global 23))
(ert-deftest threads-let-binding ()
- "simple test of threads and let bindings"
+ "Simple test of threads and let bindings."
+ (skip-unless (fboundp 'make-thread))
(should
(progn
(setq threads-test-global nil)
@@ -93,19 +103,23 @@
threads-test-global))))
(ert-deftest threads-mutexp ()
- "simple test of mutexp"
+ "Simple test of `mutexp'."
+ (skip-unless (fboundp 'make-thread))
(should-not (mutexp 'hi)))
(ert-deftest threads-mutexp-2 ()
- "another simple test of mutexp"
+ "Another simple test of `mutexp'."
+ (skip-unless (fboundp 'make-thread))
(should (mutexp (make-mutex))))
(ert-deftest threads-mutex-type ()
- "type-of mutex"
+ "type-of mutex."
+ (skip-unless (fboundp 'make-thread))
(should (eq (type-of (make-mutex)) 'mutex)))
(ert-deftest threads-mutex-lock-unlock ()
- "test mutex-lock and unlock"
+ "Test mutex-lock and unlock."
+ (skip-unless (fboundp 'make-thread))
(should
(let ((mx (make-mutex)))
(mutex-lock mx)
@@ -113,7 +127,8 @@
t)))
(ert-deftest threads-mutex-recursive ()
- "test mutex-lock and unlock"
+ "Test mutex recursion."
+ (skip-unless (fboundp 'make-thread))
(should
(let ((mx (make-mutex)))
(mutex-lock mx)
@@ -133,7 +148,8 @@
(mutex-unlock threads-mutex))
(ert-deftest threads-mutex-contention ()
- "test of mutex contention"
+ "Test of mutex contention."
+ (skip-unless (fboundp 'make-thread))
(should
(progn
(setq threads-mutex (make-mutex))
@@ -153,7 +169,8 @@
(mutex-lock threads-mutex))
(ert-deftest threads-mutex-signal ()
- "test signaling a blocked thread"
+ "Test signaling a blocked thread."
+ (skip-unless (fboundp 'make-thread))
(should
(progn
(setq threads-mutex (make-mutex))
@@ -170,7 +187,8 @@
(setq threads-test-global 23))
(ert-deftest threads-io-switch ()
- "test that accept-process-output causes thread switch"
+ "Test that `accept-process-output' causes thread switch."
+ (skip-unless (fboundp 'make-thread))
(should
(progn
(setq threads-test-global nil)
@@ -180,31 +198,37 @@
threads-test-global)))
(ert-deftest threads-condvarp ()
- "simple test of condition-variable-p"
+ "Simple test of `condition-variable-p'."
+ (skip-unless (fboundp 'make-thread))
(should-not (condition-variable-p 'hi)))
(ert-deftest threads-condvarp-2 ()
- "another simple test of condition-variable-p"
+ "Another simple test of `condition-variable-p'."
+ (skip-unless (fboundp 'make-thread))
(should (condition-variable-p (make-condition-variable (make-mutex)))))
(ert-deftest threads-condvar-type ()
"type-of condvar"
+ (skip-unless (fboundp 'make-thread))
(should (eq (type-of (make-condition-variable (make-mutex)))
'condition-variable)))
(ert-deftest threads-condvar-mutex ()
- "simple test of condition-mutex"
+ "Simple test of `condition-mutex'."
+ (skip-unless (fboundp 'make-thread))
(should
(let ((m (make-mutex)))
(eq m (condition-mutex (make-condition-variable m))))))
(ert-deftest threads-condvar-name ()
- "simple test of condition-name"
+ "Simple test of `condition-name'."
+ (skip-unless (fboundp 'make-thread))
(should
(eq nil (condition-name (make-condition-variable (make-mutex))))))
(ert-deftest threads-condvar-name-2 ()
- "another simple test of condition-name"
+ "Another simple test of `condition-name'."
+ (skip-unless (fboundp 'make-thread))
(should
(string= "hi bob"
(condition-name (make-condition-variable (make-mutex)
@@ -222,6 +246,7 @@
(ert-deftest thread-errors ()
"Test what happens when a thread signals an error."
+ (skip-unless (fboundp 'make-thread))
(let (th1 th2)
(setq th1 (make-thread #'call-error "call-error"))
(should (threadp th1))
@@ -234,6 +259,7 @@
(ert-deftest thread-sticky-point ()
"Test bug #25165 with point movement in cloned buffer."
+ (skip-unless (fboundp 'make-thread))
(with-temp-buffer
(insert "Lorem ipsum dolor sit amet, consectetur adipiscing elit.")
(goto-char (point-min))
@@ -244,6 +270,7 @@
(ert-deftest thread-signal-early ()
"Test signaling a thread as soon as it is started by the OS."
+ (skip-unless (fboundp 'make-thread))
(let ((thread
(make-thread #'(lambda ()
(while t (thread-yield))))))
@@ -263,7 +290,8 @@
(condition-wait threads-condvar)))
(ert-deftest threads-condvar-wait ()
- "test waiting on conditional variable"
+ "Test waiting on conditional variable."
+ (skip-unless (fboundp 'make-thread))
(let ((cv-mutex (make-mutex))
new-thread)
;; We could have spurious threads from the previous tests still