summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/nsm.el1
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad9548c0823..436ac16d866 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -32,6 +32,11 @@
* textmodes/ispell.el (ispell-command-loop): Don't use
`next-window'.
+2014-12-21 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * net/nsm.el (nsm-save-host): Don't save the host name twice
+ (bug#19269).
+
2014-12-18 Sam Steingold <sds@gnu.org>
Keyboard interface (C-f10) to `mouse-buffer-menu' (C-down-mouse-1).
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 2306894cde3..eb700d71c72 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -340,7 +340,6 @@ unencrypted."
;; of the certificate/unencrypted connection.
(cond
((eq what 'conditions)
- (nconc saved (list :host (format "%s:%s" host port)))
(cond
((not status)
(nconc saved '(:conditions (:unencrypted))))