From 24ac444fbe5d76a7cf09a62b741b9e956ab90d3e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 8 Oct 2010 00:51:19 -0700 Subject: [PATCH] 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. --- lisp/ChangeLog | 5 +++++ lisp/vc/ediff-diff.el | 16 +++++++--------- lisp/vc/ediff-ptch.el | 8 ++++---- lisp/vc/ediff-wind.el | 17 ++++++++--------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26648fedece..43589198bea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2010-10-08 Glenn Morris + * 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 diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 4316b6e4d93..70352751d8d 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -1,7 +1,8 @@ ;;; 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 ;; 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 diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index b6c7f6ab7ba..393bdcb673c 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -1,7 +1,8 @@ ;;; 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 ;; 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 diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 8b16c5a4a12..4d6666a86f2 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1,7 +1,8 @@ ;;; 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 ;; 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 -- 2.39.5