comparison lisp/ediff-diff.el @ 14169:83f275dcd93a

Update FSF's address.
author Erik Naggum <erik@naggum.no>
date Sun, 14 Jan 1996 07:34:30 +0000
parents 90c87743d3ba
children c768f6d7daaa
comparison
equal deleted inserted replaced
14168:3b925cc52931 14169:83f275dcd93a
1 ;;; ediff-diff.el --- diff-related utilities 1 ;;; ediff-diff.el --- diff-related utilities
2 ;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. 2
3 ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
3 4
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
5 6
6 ;; This file is part of GNU Emacs. 7 ;; This file is part of GNU Emacs.
7 8
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of 15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 ;; GNU General Public License for more details. 17 ;; GNU General Public License for more details.
17 18
18 ;; You should have received a copy of the GNU General Public License 19 ;; You should have received a copy of the GNU General Public License
19 ;; along with GNU Emacs; see the file COPYING. If not, write to 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
20 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA.
23
24 ;;; Code:
21 25
22 (require 'ediff-init) 26 (require 'ediff-init)
23
24 27
25 (defvar ediff-shell 28 (defvar ediff-shell
26 (cond ((eq system-type 'emx) "cmd") ; OS/2 29 (cond ((eq system-type 'emx) "cmd") ; OS/2
27 ((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS 30 ((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS
28 (t "sh")) ; UNIX 31 (t "sh")) ; UNIX
1159 (point)))) 1162 (point))))
1160 1163
1161 1164
1162 (provide 'ediff-diff) 1165 (provide 'ediff-diff)
1163 1166
1164
1165 ;; ediff-diff.el ends here 1167 ;; ediff-diff.el ends here