[Emacs-diffs] master be4304d: Fixes: debbugs:19269

[Lars Ingebrigtsen]

branch: master
commit be4304d8d824100b9c877988cd6c8df5e102c2ae
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Fixes: debbugs:19269
    
    * lisp/net/nsm.el (nsm-save-host): Don't save the host name twice.
---
 lisp/ChangeLog  |    5 +++++
 lisp/net/nsm.el |    1 -
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad9548c..436ac16 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  <address@hidden>
+
+       * net/nsm.el (nsm-save-host): Don't save the host name twice
+       (bug#19269).
+
 2014-12-18  Sam Steingold  <address@hidden>
 
        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 2306894..eb700d7 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))))