aboutsummaryrefslogtreecommitdiffstats
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 @@
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
352014-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
352014-12-18 Sam Steingold <sds@gnu.org> 402014-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))))