diff options
| author | Lars Ingebrigtsen | 2014-12-21 13:21:16 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2014-12-21 17:20:54 +0100 |
| commit | be4304d8d824100b9c877988cd6c8df5e102c2ae (patch) | |
| tree | f154b7445032ab12638d2f11a2ccb9b35a57fb81 | |
| parent | a8856cb50b6a99c23664cdb3c66b480bf880edcf (diff) | |
| download | emacs-be4304d8d824100b9c877988cd6c8df5e102c2ae.tar.gz emacs-be4304d8d824100b9c877988cd6c8df5e102c2ae.zip | |
Fixes: debbugs:19269
* lisp/net/nsm.el (nsm-save-host): Don't save the host name twice.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/nsm.el | 1 |
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 @@ | |||
| 32 | * textmodes/ispell.el (ispell-command-loop): Don't use | 32 | * textmodes/ispell.el (ispell-command-loop): Don't use |
| 33 | `next-window'. | 33 | `next-window'. |
| 34 | 34 | ||
| 35 | 2014-12-21 Lars Ingebrigtsen <larsi@gnus.org> | ||
| 36 | |||
| 37 | * net/nsm.el (nsm-save-host): Don't save the host name twice | ||
| 38 | (bug#19269). | ||
| 39 | |||
| 35 | 2014-12-18 Sam Steingold <sds@gnu.org> | 40 | 2014-12-18 Sam Steingold <sds@gnu.org> |
| 36 | 41 | ||
| 37 | Keyboard interface (C-f10) to `mouse-buffer-menu' (C-down-mouse-1). | 42 | 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." | |||
| 340 | ;; of the certificate/unencrypted connection. | 340 | ;; of the certificate/unencrypted connection. |
| 341 | (cond | 341 | (cond |
| 342 | ((eq what 'conditions) | 342 | ((eq what 'conditions) |
| 343 | (nconc saved (list :host (format "%s:%s" host port))) | ||
| 344 | (cond | 343 | (cond |
| 345 | ((not status) | 344 | ((not status) |
| 346 | (nconc saved '(:conditions (:unencrypted)))) | 345 | (nconc saved '(:conditions (:unencrypted)))) |