# HG changeset patch # User Glenn Morris # Date 1289363087 28800 # Node ID 2b266010d0b7b95332ef96ca2b6e53194ce44c17 # Parent ca911a71a6c8c4321a3967c4e864bee836d144c1 system-type related trivia. * lisp/cedet/semantic/bovine/c.el: Test system-type with memq. * lisp/progmodes/cperl-mode.el (cperl-find-pods-heres, cperl-write-tags): No recent Emacs supports system-type `emx'. * lisp/progmodes/ada-xref.el (is-windows): Rename to ada-on-ms-windows. (ada-command-separator, ada-default-prj-properties) (ada-find-any-references): Update for above name change. * lisp/dirtrack.el (dirtrack-directory-function) (dirtrack-canonicalize-function): * lisp/filecache.el (file-cache-completion-ignore-case) (file-cache-case-fold-search, file-cache-ignore-case): * lisp/term.el (serial-port-is-file-p): Cosmetic change. * lisp/emulation/viper-init.el (viper-ms-style-os-p): Doc fix. Remove non-existent `windows-95' system-type. * lisp/dired.el (dired-chown-program): Remove non-existent `linux' system-type. * lisp/locate.el: Comment. diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/ChangeLog --- a/lisp/ChangeLog Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/ChangeLog Tue Nov 09 20:24:47 2010 -0800 @@ -1,5 +1,23 @@ 2010-11-10 Glenn Morris + * progmodes/cperl-mode.el (cperl-find-pods-heres, cperl-write-tags): + No recent Emacs supports system-type `emx'. + + * progmodes/ada-xref.el (is-windows): Rename to ada-on-ms-windows. + (ada-command-separator, ada-default-prj-properties) + (ada-find-any-references): Update for above name change. + + * dirtrack.el (dirtrack-directory-function) + (dirtrack-canonicalize-function): + * filecache.el (file-cache-completion-ignore-case) + (file-cache-case-fold-search, file-cache-ignore-case): + * term.el (serial-port-is-file-p): Cosmetic change. + + * emulation/viper-init.el (viper-ms-style-os-p): Doc fix. + Remove non-existent `windows-95' system-type. + * dired.el (dired-chown-program): Remove non-existent `linux' + system-type. + * 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 ca911a71a6c8 -r 2b266010d0b7 lisp/cedet/ChangeLog --- a/lisp/cedet/ChangeLog Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/cedet/ChangeLog Tue Nov 09 20:24:47 2010 -0800 @@ -1,3 +1,7 @@ +2010-11-10 Glenn Morris + + * semantic/bovine/c.el: Test system-type with memq. + 2010-11-09 Glenn Morris * semantic/lex.el (semantic-lex-ignore-comments, semantic-flex): diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/cedet/semantic/bovine/c.el --- a/lisp/cedet/semantic/bovine/c.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/cedet/semantic/bovine/c.el Tue Nov 09 20:24:47 2010 -0800 @@ -94,8 +94,8 @@ ;; Compiler options need to show up after path setup, but before ;; the preprocessor section. -(when (member system-type '(gnu gnu/linux darwin cygwin)) - (semantic-gcc-setup)) +(if (memq system-type '(gnu gnu/linux darwin cygwin)) + (semantic-gcc-setup)) ;;; Pre-processor maps ;; diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/dired.el --- a/lisp/dired.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/dired.el Tue Nov 09 20:24:47 2010 -0800 @@ -73,7 +73,7 @@ ;;;###autoload (defvar dired-chown-program (purecopy - (if (memq system-type '(hpux usg-unix-v irix linux gnu/linux cygwin)) + (if (memq system-type '(hpux usg-unix-v irix gnu/linux cygwin)) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/dirtrack.el --- a/lisp/dirtrack.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/dirtrack.el Tue Nov 09 20:24:47 2010 -0800 @@ -144,7 +144,7 @@ :type 'string) (defcustom dirtrack-directory-function - (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) + (if (memq system-type '(ms-dos windows-nt cygwin)) 'dirtrack-windows-directory-function 'file-name-as-directory) "Function to apply to the prompt directory for comparison purposes." @@ -152,7 +152,7 @@ :type 'function) (defcustom dirtrack-canonicalize-function - (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) + (if (memq system-type '(ms-dos windows-nt cygwin)) 'downcase 'identity) "Function to apply to the default directory for comparison purposes." :group 'dirtrack @@ -269,5 +269,4 @@ (provide 'dirtrack) -;; arch-tag: 168de071-be88-4937-aff6-2aba9f328d5a ;;; dirtrack.el ends here diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/emulation/viper-init.el --- a/lisp/emulation/viper-init.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/emulation/viper-init.el Tue Nov 09 20:24:47 2010 -0800 @@ -1,7 +1,7 @@ ;;; viper-init.el --- some common definitions for Viper -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Kifer ;; Package: viper @@ -63,9 +63,10 @@ (defun viper-window-display-p () (and (viper-device-type) (not (memq (viper-device-type) '(tty stream pc))))) -(defcustom viper-ms-style-os-p (memq system-type - '(ms-dos windows-nt windows-95)) - "Tells if Emacs is running under an MS-style OS: ms-dos, windows-nt, W95." +(defcustom viper-ms-style-os-p + (memq system-type (if (featurep 'emacs) '(ms-dos windows-nt) + '(ms-dos windows-nt windows-95))) + "Non-nil if Emacs is running under an MS-style OS: MS-DOS, or MS-Windows." :type 'boolean :tag "Is it Microsoft-made OS?" :group 'viper-misc) @@ -996,5 +997,4 @@ ;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) ;; End: -;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250 ;;; viper-init.el ends here diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/filecache.el --- a/lisp/filecache.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/filecache.el Tue Nov 09 20:24:47 2010 -0800 @@ -207,7 +207,7 @@ :group 'file-cache) (defcustom file-cache-completion-ignore-case - (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) + (if (memq system-type '(ms-dos windows-nt cygwin)) t completion-ignore-case) "If non-nil, file-cache completion should ignore case. @@ -216,7 +216,7 @@ :group 'file-cache) (defcustom file-cache-case-fold-search - (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) + (if (memq system-type '(ms-dos windows-nt cygwin)) t case-fold-search) "If non-nil, file-cache completion should ignore case. @@ -225,7 +225,7 @@ :group 'file-cache) (defcustom file-cache-ignore-case - (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) + (memq system-type '(ms-dos windows-nt cygwin)) "Non-nil means ignore case when checking completions in the file cache. Defaults to nil on DOS and Windows, and t on other systems." :type 'boolean @@ -687,5 +687,4 @@ (provide 'filecache) -;; arch-tag: 433d3ca4-4af2-47ce-b2cf-1f727460f538 ;;; filecache.el ends here diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/locate.el --- a/lisp/locate.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/locate.el Tue Nov 09 20:24:47 2010 -0800 @@ -97,7 +97,7 @@ ;; (defadvice dired-make-relative (before set-no-error activate) ;; "For locate mode and Windows, don't return errors" ;; (if (and (eq major-mode 'locate-mode) -;; (memq system-type (list 'windows-nt 'ms-dos))) +;; (memq system-type '(windows-nt ms-dos))) ;; (ad-set-arg 2 t) ;; )) ;; diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/progmodes/ada-xref.el --- a/lisp/progmodes/ada-xref.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/progmodes/ada-xref.el Tue Nov 09 20:24:47 2010 -0800 @@ -167,7 +167,7 @@ Otherwise, ask the user for the name of the project file to use." :type 'boolean :group 'ada) -(defconst is-windows (memq system-type (quote (windows-nt))) +(defconst ada-on-ms-windows (memq system-type '(windows-nt)) "True if we are running on Windows.") (defcustom ada-tight-gvd-integration nil @@ -222,7 +222,7 @@ On Windows systems using `cmdproxy.exe' as the shell, we need to use `/d' or the drive is never changed.") -(defvar ada-command-separator (if is-windows " && " "\n") +(defvar ada-command-separator (if ada-on-ms-windows " && " "\n") "Separator to use between multiple commands to `compile' or `start-process'. `cmdproxy.exe' doesn't recognize multiple-line commands, so we have to use \"&&\" for now.") @@ -768,7 +768,7 @@ 'comp_opt ada-prj-default-comp-opt 'cross_prefix "" 'debug_cmd (concat ada-prj-default-debugger - " ${main}" (if is-windows ".exe")) ;; FIXME: don't need .exe? + " ${main}" (if ada-on-ms-windows ".exe")) ;; FIXME: don't need .exe? 'debug_post_cmd (list nil) 'debug_pre_cmd (list (concat ada-cd-command " ${build_dir}")) 'gnatmake_opt ada-prj-default-gnatmake-opt @@ -782,7 +782,7 @@ 'make_cmd (list ada-prj-default-make-cmd) ;; FIXME: should not a list 'obj_dir (list ".") 'remote_machine "" - 'run_cmd (list (concat "./${main}" (if is-windows ".exe"))) + 'run_cmd (list (concat "./${main}" (if ada-on-ms-windows ".exe"))) ;; FIXME: should not a list ;; FIXME: don't need .exe? 'src_dir (list ".") @@ -1016,7 +1016,7 @@ ;; processed (gnatfind \"+\":...). (let* ((quote-entity (if (= (aref entity 0) ?\") - (if is-windows + (if ada-on-ms-windows (concat "\\\"" (substring entity 1 -1) "\\\"") (concat "'\"" (substring entity 1 -1) "\"'")) entity)) diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/progmodes/cperl-mode.el --- a/lisp/progmodes/cperl-mode.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/progmodes/cperl-mode.el Tue Nov 09 20:24:47 2010 -0800 @@ -3803,7 +3803,8 @@ indentable t)) ;; Need to remove face as well... (goto-char min) - (and (eq system-type 'emx) + ;; 'emx not supported by Emacs since at least 21.1. + (and (featurep 'xemacs) (eq system-type 'emx) (eq (point) 1) (let ((case-fold-search t)) (looking-at "extproc[ \t]")) ; Analogue of #! @@ -7038,7 +7039,7 @@ (or topdir (setq topdir default-directory)) (let ((tags-file-name "TAGS") - (case-fold-search (eq system-type 'emx)) + (case-fold-search (and (featurep 'xemacs) (eq system-type 'emx))) xs rel tm) (save-excursion (cond (inbuffer nil) ; Already there diff -r ca911a71a6c8 -r 2b266010d0b7 lisp/term.el --- a/lisp/term.el Tue Nov 09 20:13:21 2010 -0800 +++ b/lisp/term.el Tue Nov 09 20:24:47 2010 -0800 @@ -4223,7 +4223,7 @@ files, such as /dev/ttyS0. Return nil if this is Windows or DOS, where serial ports have special identifiers such as COM1." - (not (member system-type (list 'windows-nt 'cygwin 'ms-dos)))) + (not (memq system-type '(windows-nt cygwin ms-dos)))) (defvar serial-name-history (if (serial-port-is-file-p)