From: Glenn Morris <rgm@gnu.org>
Date: Wed, 10 Nov 2010 04:13:21 +0000 (-0800)
Subject: net-utils system-type trivia.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~323
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17731c39b249ec0e40ece1e18ed120ff4031568c;p=emacs.git

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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5b45fda925..19500be1a7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index b69c571ddf5..60829f300b5 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -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 @@ from SEARCH-STRING.  With argument, prompt for whois server."
 
 (provide 'net-utils)
 
-;; arch-tag: 97119e91-9edb-4376-838b-bf7058fa1314
 ;;; net-utils.el ends here