Commit 24ac444f authored by Glenn Morris's avatar Glenn Morris
Browse files

Remove some tests for defunct system-types.

* lisp/vc/ediff-wind.el (ediff-setup-control-frame):
* lisp/vc/ediff-ptch.el (ediff-default-backup-extension):
* lisp/vc/ediff-diff.el (ediff-shell, ediff-diff-options)
(ediff-exec-process): Remove system-types emx, windows-95.
parent 5d5870b8
2010-10-08 Glenn Morris <rgm@gnu.org>
 
* vc/ediff-wind.el (ediff-setup-control-frame):
* vc/ediff-ptch.el (ediff-default-backup-extension):
* vc/ediff-diff.el (ediff-shell, ediff-diff-options)
(ediff-exec-process): Remove system-types emx, windows-95.
* net/browse-url.el (browse-url-xdg-open): Shell-quote url. (Bug#7166)
 
2010-10-07 Chong Yidong <cyd@stupidchicken.com>
......
;;; ediff-diff.el --- diff-related utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
......@@ -54,8 +55,7 @@ Must produce output compatible with Unix's diff3 program."
(fset 'ediff-set-actual-diff-options '(lambda () nil))
(defcustom ediff-shell
(cond ((eq system-type 'emx) "cmd") ; OS/2
((memq system-type '(ms-dos windows-nt windows-95))
(cond ((memq system-type '(ms-dos windows-nt))
shell-file-name) ; no standard name on MS-DOS
(t "sh")) ; UNIX
"The shell used to run diff and patch.
......@@ -85,7 +85,7 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP."
(ediff-set-actual-diff-options))
(defcustom ediff-diff-options
(if (memq system-type '(ms-dos windows-nt windows-95)) "--binary" "")
(if (memq system-type '(ms-dos windows-nt)) "--binary" "")
"Options to pass to `ediff-diff-program'.
If Unix diff is used as `ediff-diff-program',
then a useful option is `-w', to ignore space.
......@@ -1229,15 +1229,14 @@ delimiter regions"))
(with-current-buffer buffer
(erase-buffer)
(setq default-directory directory)
(if (or (memq system-type '(emx ms-dos windows-nt windows-95))
(if (or (memq system-type '(ms-dos windows-nt))
synch)
;; In OS/2 (emx) do it synchronously, since OS/2 doesn't let us
;; In Windows do it synchronously, since Windows doesn't let us
;; delete files used by other processes. Thus, in ediff-buffers
;; and similar functions, we can't delete temp files because
;; they might be used by the asynch process that computes
;; custom diffs. So, we have to wait till custom diff
;; subprocess is done.
;; Similarly for Windows-*
;; In DOS, must synchronize because DOS doesn't have
;; asynchronous processes.
(apply 'call-process program nil buffer nil args)
......@@ -1533,5 +1532,4 @@ affects only files whose names match the expression."
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648
;;; ediff-diff.el ends here
;;; ediff-ptch.el --- Ediff's patch support
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
......@@ -62,7 +63,7 @@ case the default value for this variable should be changed."
;; the default backup extension
(defconst ediff-default-backup-extension
(if (memq system-type '(emx ms-dos))
(if (eq system-type 'ms-dos)
"_orig" ".orig"))
......@@ -841,5 +842,4 @@ you can still examine the changes via M-x ediff-files"
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
;; arch-tag: 2fe2161e-e116-469b-90fa-5cbb44c1bd1b
;;; ediff-ptch.el ends here
;;; ediff-wind.el --- window manipulation utilities
;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
......@@ -978,12 +979,11 @@ into icons, regardless of the window manager."
(set-specifier left-toolbar-width (list ctl-frame 0))
(set-specifier right-toolbar-width (list ctl-frame 0))))
;; Under OS/2 (emx) we have to call modify frame parameters twice, in order
;; to make sure that at least once we do it for non-iconified frame. If
;; appears that in the OS/2 port of Emacs, one can't modify frame
;; parameters of iconified frames. As a precaution, we do likewise for
;; windows-nt.
(if (memq system-type '(emx windows-nt windows-95))
;; As a precaution, we call modify frame parameters twice, in
;; order to make sure that at least once we do it for
;; a non-iconified frame. (It appears that in the Windows port of
;; Emacs, one can't modify frame parameters of iconified frames.)
(if (eq system-type 'windows-nt)
(modify-frame-parameters ctl-frame adjusted-parameters))
;; make or zap toolbar (if not requested)
......@@ -1310,5 +1310,4 @@ It assumes that it is called from within the control buffer."
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
;; arch-tag: 73d9a5d7-eed7-4d9c-8b4b-21d5d78eb597
;;; ediff-wind.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment