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 f5b45fda9259d04c7b5a0fa109aefcc8765683e4..19500be1a7f409a3849fbc6db7cfa10be7acc90f 100644 (file)
--- 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 b69c571ddf54727adbd12354fe2b5ecdaa682db1..60829f300b5de89b2989e7cdf6e8f4c0d3f80e33 100644 (file)
--- 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