mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Update FSF's address.
This commit is contained in:
parent
8f65287798
commit
b578f267af
351 changed files with 5589 additions and 5125 deletions
|
|
@ -1,5 +1,6 @@
|
|||
;;; ediff-diff.el --- diff-related utilities
|
||||
;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
|
||||
|
||||
;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
|
||||
|
||||
|
|
@ -16,12 +17,14 @@
|
|||
;; GNU General Public License for more details.
|
||||
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with GNU Emacs; see the file COPYING. If not, write to
|
||||
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
||||
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
;; Boston, MA 02111-1307, USA.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'ediff-init)
|
||||
|
||||
|
||||
(defvar ediff-shell
|
||||
(cond ((eq system-type 'emx) "cmd") ; OS/2
|
||||
((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS
|
||||
|
|
@ -1161,5 +1164,4 @@ argument to `skip-chars-forward'."
|
|||
|
||||
(provide 'ediff-diff)
|
||||
|
||||
|
||||
;; ediff-diff.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue