aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2012-08-04 10:08:11 +0200
committerAndreas Schwab2012-08-04 10:08:11 +0200
commit7fcc0070f0fed6e8f58487757ac273fe2fdc90fc (patch)
tree90cea4ee3e4cd6a4c5da6c6cff737473cc90a353
parent00340faf00fcb59e9a2cf16d9ff8395c9c48a167 (diff)
downloademacs-7fcc0070f0fed6e8f58487757ac273fe2fdc90fc.tar.gz
emacs-7fcc0070f0fed6e8f58487757ac273fe2fdc90fc.zip
* simple.el (list-processes--refresh): For a server use :host or
:local as the address.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91a280211d3..c1e0c82b6be 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-08-04 Andreas Schwab <schwab@linux-m68k.org>
2
3 * simple.el (list-processes--refresh): For a server use :host or
4 :local as the address.
5
12012-08-04 Michal Nazarewicz <mina86@mina86.com> (tiny change) 62012-08-04 Michal Nazarewicz <mina86@mina86.com> (tiny change)
2 7
3 * lisp/mpc.el: Support password in host argument. 8 * lisp/mpc.el: Support password in host argument.
diff --git a/lisp/simple.el b/lisp/simple.el
index e1d6760e72b..d17bd8dc326 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2881,7 +2881,9 @@ Also, delete any process that is exited or signaled."
2881 "network") 2881 "network")
2882 (if (plist-get contact :server) 2882 (if (plist-get contact :server)
2883 (format "server on %s" 2883 (format "server on %s"
2884 (plist-get contact :server)) 2884 (or
2885 (plist-get contact :host)
2886 (plist-get contact :local)))
2885 (format "connection to %s" 2887 (format "connection to %s"
2886 (plist-get contact :host)))) 2888 (plist-get contact :host))))
2887 (format "(serial port %s%s)" 2889 (format "(serial port %s%s)"