diff options
| author | Paul Eggert | 2020-01-05 11:48:59 -0800 |
|---|---|---|
| committer | Paul Eggert | 2020-01-05 11:50:31 -0800 |
| commit | 088bfcc2d80eed44864147f3491eff69e4eb5cd8 (patch) | |
| tree | a57599fb3064d09c38eec4ddd9cded8a3df72e6c /lisp/net | |
| parent | 448df8fec7a7fb3fe558749591e657e8a84cb46b (diff) | |
| download | emacs-088bfcc2d80eed44864147f3491eff69e4eb5cd8.tar.gz emacs-088bfcc2d80eed44864147f3491eff69e4eb5cd8.zip | |
Move “Fix some broken conditional forms” to master
Revert 2020-01-04T19:17:12Z!eggert@cs.ucla.edu
which recently I installed into the emacs-27 branch by mistake.
These patches are now on master instead (via merging).
Do not merge to master.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/nsm.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index 1b0f04e5a19..e94947bc7f1 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el | |||
| @@ -311,9 +311,9 @@ See also: `network-security-protocol-checks' and `nsm-noninteractive'" | |||
| 311 | (map-values results) | 311 | (map-values results) |
| 312 | "\n") | 312 | "\n") |
| 313 | "\n") | 313 | "\n") |
| 314 | "\n* ")))))) | 314 | "\n* "))))) |
| 315 | (delete-process process) | 315 | (delete-process process) |
| 316 | (setq process nil)) | 316 | (setq process nil))) |
| 317 | (run-hook-with-args 'nsm-tls-post-check-functions | 317 | (run-hook-with-args 'nsm-tls-post-check-functions |
| 318 | host port status settings results))) | 318 | host port status settings results))) |
| 319 | process) | 319 | process) |