[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] nsm 01/02: Clear pending input after reading the char to a
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] nsm 01/02: Clear pending input after reading the char to avoid confusing Emacs |
Date: |
Tue, 18 Nov 2014 17:51:18 +0000 |
branch: nsm
commit d5c20296c14591d140db3e23bcc721faf854c18e
Author: Lars Magne Ingebrigtsen <address@hidden>
Date: Tue Nov 18 17:56:48 2014 +0100
Clear pending input after reading the char to avoid confusing Emacs
---
lisp/net/nsm.el | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 9e8684d..35f9ce2 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -203,6 +203,9 @@ unencrypted."
(ding)
(setq prefix "Invalid choice. ")))
(kill-buffer buffer)
+ ;; If called from a callback, `read-char' will insert things
+ ;; into the pending input. Clear that.
+ (clear-this-command-keys)
response)))
(defun nsm-save-host (id status what permanency)
@@ -288,7 +291,8 @@ unencrypted."
(when cert
(format "Certificate issued by %s\nIssued to %s\nCertificate host name:
%s\nPublic key: %s, signature: %s, security level: %s\nValid from: %s, valid
to: %s\n"
(nsm-certificate-part (plist-get cert :issuer) "CN")
- (nsm-certificate-part (plist-get cert :subject) "O")
+ (or (nsm-certificate-part (plist-get cert :subject) "O")
+ (nsm-certificate-part (plist-get cert :subject) "OU"))
(nsm-certificate-part (plist-get cert :subject) "CN")
(plist-get cert :public-key-algorithm)
(plist-get cert :signature-algorithm)