comparison lisp/ediff-help.el @ 90737:95d0cdf160ea

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 586-614) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - Merge from erc--main--0 - Make byte compiler correctly write circular constants * gnus--rel--5.10 (patch 186-196) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
author Miles Bader <miles@gnu.org>
date Fri, 26 Jan 2007 06:16:11 +0000
parents d1c5430c5bff e3694f1cb928
children f55f9811f5d7
comparison
equal deleted inserted replaced
90736:ef1369583937 90737:95d0cdf160ea
1 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers 1 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
2 2
3 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 3 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
4 ;; 2004, 2005, 2006 Free Software Foundation, Inc. 4 ;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
5 5
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 7
8 ;; This file is part of GNU Emacs. 8 ;; This file is part of GNU Emacs.
9 9