# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1289362401 28800
# Node ID ca911a71a6c8c4321a3967c4e864bee836d144c1
# Parent  c62a6dd970b95af9ae214db1ed284d35fd55c4a5
net-utils system-type trivia.

* lisp/net/net-utils.el (net-utils-remove-ctl-m): Use memq for system-types.
(ping-program-options): Remove non-existent `linux' system-type.

diff -r c62a6dd970b9 -r ca911a71a6c8 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 09 20:11:08 2010 -0800
+++ b/lisp/ChangeLog	Tue Nov 09 20:13:21 2010 -0800
@@ -1,5 +1,8 @@
 2010-11-10  Glenn Morris  <rgm@gnu.org>
 
+	* net/net-utils.el (net-utils-remove-ctl-m): Use memq for system-types.
+	(ping-program-options): Remove non-existent `linux' system-type.
+
 	* startup.el (package-initialize): Update declaration.
 
 	* textmodes/remember.el (remember-time-to-seconds): Remove.
diff -r c62a6dd970b9 -r ca911a71a6c8 lisp/net/net-utils.el
--- a/lisp/net/net-utils.el	Tue Nov 09 20:11:08 2010 -0800
+++ b/lisp/net/net-utils.el	Tue Nov 09 20:13:21 2010 -0800
@@ -55,8 +55,7 @@
   :group 'comm
   :version "20.3")
 
-(defcustom net-utils-remove-ctl-m
-  (member system-type (list 'windows-nt 'msdos))
+(defcustom net-utils-remove-ctl-m (memq system-type '(windows-nt msdos))
   "If non-nil, remove control-Ms from output."
   :group 'net-utils
   :type  'boolean)
@@ -82,7 +81,7 @@
 ;; On GNU/Linux and Irix, the system's ping program seems to send packets
 ;; indefinitely unless told otherwise
 (defcustom ping-program-options
-  (and (memq system-type (list 'linux 'gnu/linux 'irix))
+  (and (memq system-type '(gnu/linux irix))
        (list "-c" "4"))
   "Options for the ping program.
 These options can be used to limit how many ICMP packets are emitted."
@@ -889,5 +888,4 @@
 
 (provide 'net-utils)
 
-;; arch-tag: 97119e91-9edb-4376-838b-bf7058fa1314
 ;;; net-utils.el ends here