aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorGlenn Morris2020-02-06 07:50:29 -0800
committerGlenn Morris2020-02-06 07:50:29 -0800
commit68d43392a65186a944c839dc576b2b01deafbb0d (patch)
tree2392fb385569e10ad9d4d0ab2a48a1771131bf4e /lisp/net
parentcf14fa0427d6f490972521f7a55134e7139117c6 (diff)
parent09eed01afb4968a93247fb8eb7b5301a5bfb6342 (diff)
downloademacs-68d43392a65186a944c839dc576b2b01deafbb0d.tar.gz
emacs-68d43392a65186a944c839dc576b2b01deafbb0d.zip
Merge from origin/emacs-27
09eed01afb Wrap some set-auto-mode calls with delay-mode-hooks (bug#3... 4a0a114505 Support ido-vertical-mode better ef5fba9f40 Fix faces tab-bar and tab-line. 831508422e Cater for 3-argument version of pthread_setname_np f27187f963 Clarify lexvar restrictions for add-to-ordered-list, add-t... 32763dac46 Replace add-to-list to lexical variable with push (bug#39373) d07f177382 Clarify add-to-list documentation (bug#39373) d3d2ea927c MH-E: alter content in mh-display-msg, not mh-show-mode db7fa2546f Update documentation for mh-show-mode-hook d10be6bf28 Example goto-addr hook: MH-E already uses goto-address # Conflicts: # etc/NEWS
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/goto-addr.el8
-rw-r--r--lisp/net/tramp-cache.el4
-rw-r--r--lisp/net/zeroconf.el12
3 files changed, 12 insertions, 12 deletions
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 7dd778dc8d5..9436f45aa32 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -5,7 +5,7 @@
5;; Author: Eric Ding <ericding@alum.mit.edu> 5;; Author: Eric Ding <ericding@alum.mit.edu>
6;; Maintainer: emacs-devel@gnu.org 6;; Maintainer: emacs-devel@gnu.org
7;; Created: 15 Aug 1995 7;; Created: 15 Aug 1995
8;; Keywords: mh-e, www, mouse, mail 8;; Keywords: www, mouse, mail
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -32,10 +32,10 @@
32 32
33;; INSTALLATION 33;; INSTALLATION
34;; 34;;
35;; To use goto-address in a particular mode (for example, while 35;; To use goto-address in a particular mode (this example uses
36;; reading mail in mh-e), add this to your init file: 36;; the fictional rich-text-mode), add this to your init file:
37;; 37;;
38;; (add-hook 'mh-show-mode-hook 'goto-address) 38;; (add-hook 'rich-text-mode-hook 'goto-address)
39;; 39;;
40;; The mouse click method is bound to [mouse-2] on highlighted URLs or 40;; The mouse click method is bound to [mouse-2] on highlighted URLs or
41;; e-mail addresses only; it functions normally everywhere else. To bind 41;; e-mail addresses only; it functions normally everywhere else. To bind
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 92c98486f46..1998042d699 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -368,7 +368,7 @@ used to cache connection properties of the local machine."
368 (let ((hash (gethash key tramp-cache-data)) 368 (let ((hash (gethash key tramp-cache-data))
369 properties) 369 properties)
370 (when (hash-table-p hash) 370 (when (hash-table-p hash)
371 (maphash (lambda (x _y) (add-to-list 'properties x 'append)) hash)) 371 (maphash (lambda (x _y) (push x properties)) hash))
372 properties)) 372 properties))
373 (setq tramp-cache-data-changed t) 373 (setq tramp-cache-data-changed t)
374 (remhash key tramp-cache-data)) 374 (remhash key tramp-cache-data))
@@ -417,7 +417,7 @@ used to cache connection properties of the local machine."
417 (when (and (tramp-file-name-p key) 417 (when (and (tramp-file-name-p key)
418 (null (tramp-file-name-localname key)) 418 (null (tramp-file-name-localname key))
419 (tramp-connection-property-p key "process-buffer")) 419 (tramp-connection-property-p key "process-buffer"))
420 (add-to-list 'result key))) 420 (push key result)))
421 tramp-cache-data) 421 tramp-cache-data)
422 result)) 422 result))
423 423
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index b8becd712f5..cb3c0f2a7ee 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -256,17 +256,17 @@ supported keys depend on the service type.")
256 "Return all discovered Avahi service names as list." 256 "Return all discovered Avahi service names as list."
257 (let (result) 257 (let (result)
258 (maphash 258 (maphash
259 (lambda (_key value) (add-to-list 'result (zeroconf-service-name value))) 259 (lambda (_key value) (push (zeroconf-service-name value) result))
260 zeroconf-services-hash) 260 zeroconf-services-hash)
261 result)) 261 (delete-dups result)))
262 262
263(defun zeroconf-list-service-types () 263(defun zeroconf-list-service-types ()
264 "Return all discovered Avahi service types as list." 264 "Return all discovered Avahi service types as list."
265 (let (result) 265 (let (result)
266 (maphash 266 (maphash
267 (lambda (_key value) (add-to-list 'result (zeroconf-service-type value))) 267 (lambda (_key value) (push (zeroconf-service-type value) result))
268 zeroconf-services-hash) 268 zeroconf-services-hash)
269 result)) 269 (delete-dups result)))
270 270
271(defun zeroconf-list-services (type) 271(defun zeroconf-list-services (type)
272 "Return all discovered Avahi services for a given service type TYPE. 272 "Return all discovered Avahi services for a given service type TYPE.
@@ -278,9 +278,9 @@ format of SERVICE."
278 (maphash 278 (maphash
279 (lambda (_key value) 279 (lambda (_key value)
280 (when (equal type (zeroconf-service-type value)) 280 (when (equal type (zeroconf-service-type value))
281 (add-to-list 'result value))) 281 (push value result)))
282 zeroconf-services-hash) 282 zeroconf-services-hash)
283 result)) 283 (delete-dups result)))
284 284
285(defvar zeroconf-service-added-hooks-hash (make-hash-table :test 'equal) 285(defvar zeroconf-service-added-hooks-hash (make-hash-table :test 'equal)
286 "Hash table of hooks for newly added services. 286 "Hash table of hooks for newly added services.