From: Dave Love <fx@gnu.org>
Date: Tue, 7 Dec 1999 10:21:20 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~5843
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2edf347fb277ac23911a364bb50f563527e55f2e;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a897f0bed96..ed1d853d096 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-07  Dave Love  <fx@gnu.org>
+
+	* ffap.el: Autoload the ffap alias directly.
+
 1999-12-07  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* diff-mode.el (diff-mode-shared-map): fset'd and doc change.
@@ -124,6 +128,7 @@
 	tags-recognize-empty-tags-table.
 	(complete-tag): Call tags-complete-tag bypassing try-completion.
 	
+>>>>>>> 1.221
 1999-12-06  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule.el (set-buffer-file-coding-system): Docstring