From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 21 Dec 2014 12:21:16 +0000 (+0100)
Subject: Fixes: debbugs:19269
X-Git-Tag: emacs-25.0.90~2635^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be4304d8d824100b9c877988cd6c8df5e102c2ae;p=emacs.git

Fixes: debbugs:19269

* lisp/net/nsm.el (nsm-save-host): Don't save the host name twice.
---

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))))