Skip to content

Commit b160616

Browse files
ikappakibbatsov
authored andcommitted
Remove CircleCI MS-Windows-linter job, fix doc formatting
The MS-Windows linter job is superficial.
1 parent ab910c8 commit b160616

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

.circleci/config.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,6 @@ jobs:
8181
- setup
8282
- lint
8383

84-
test-windows-lint:
85-
executor: win/default
86-
steps:
87-
- run:
88-
name: Install Emacs latest
89-
command: |
90-
choco install emacs
91-
# temporary workaround for
92-
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51038
93-
# can be removed in versions newer than 27.2
94-
emacs --batch --eval '(progn (require ''nsm) (make-directory (file-name-directory (directory-file-name nsm-settings-file)) t) (when (file-exists-p nsm-settings-file) (nsm-read-settings)) (setq nsm-permanent-host-settings (append nsm-permanent-host-settings ''( (:id \"sha1:ccfd2cc2a08c89a9b10969be8c1e926954d53e28\" :fingerprints (\"sha1:0c:bd:68:cb:c0:01:e2:ad:93:0d:b9:3b:77:09:2e:47:9c:de:6b:28\") :host \"stable.melpa.org:443\" :conditions (:expired :invalid :verify-cert)) (:id \"sha1:85b31c268009209a8d3c5387033b219264f7e62b\" :fingerprints (\"sha1:0c:bd:68:cb:c0:01:e2:ad:93:0d:b9:3b:77:09:2e:47:9c:de:6b:28\") :host \"melpa.org:443\" :conditions (:expired :invalid :verify-cert)) (:id \"sha1:6d4eb958390599243ba9f5035cb671fa8dd6a93a\" :fingerprints (\"sha1:56:41:11:79:62:b9:85:66:f8:9e:e4:3b:39:2d:5f:a6:a5:c7:e9:2d\") :host \"elpa.gnu.org:443\" :conditions (:expired :invalid :verify-cert))) )) (nsm-write-settings))'
95-
- setup-windows
96-
- lint
97-
9884
workflows:
9985
version: 2
10086
ci-test-matrix:
@@ -104,4 +90,3 @@ workflows:
10490
- test-emacs-master
10591
- test-lint
10692
- test-windows-emacs-latest
107-
- test-windows-lint

doc/modules/ROOT/pages/contributing/hacking.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,14 @@ such as `/tmp/a-dir` or `/docker/src, in tests,` as test inputs. These
179179
are not valid absolute paths on Windows though, since they are missing
180180
the initial driver letter (e.g.`c:/tmp/a-dir`), but we can wrap them
181181
around with `expand-file-name` to make them so e.g. in tests
182-
183-
---
182+
+
183+
[source,emacs-lisp]
184+
----
184185
(let ((a-dir (expand-file-name "/tmp/a-dir"))
185186
(docker-src (expand-file-name "/docker/src")))
186187
;; ...
187188
)
188-
---
189+
----
189190

190191
. Command-line arguments. When calling external programs, it might be
191192
necessary to quote some long command line arguments, though quoting

0 commit comments

Comments
 (0)