# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 978026457 0
# Node ID 753fec5bba1acaf9452c5ba5214e147d111ec436
# Parent  a64b182fd5e5630b6ff6c22a9793f7bbeadd0403
*** empty log message ***

diff -r a64b182fd5e5 -r 753fec5bba1a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 28 17:54:10 2000 +0000
+++ b/lisp/ChangeLog	Thu Dec 28 18:00:57 2000 +0000
@@ -3,6 +3,11 @@
 	* simple.el (delete-key-deletes-forward-mode): Bind backspace
 	and delete in isearch-mode-map.
 
+2000-12-28  Richard M. Stallman  <rms@gnu.org>
+
+	* dired-x.el (dired-guess-shell-alist-default): 
+	Use xpdf instead of acroread.
+
 2000-12-28  Kenichi Handa  <handa@etl.go.jp>
 
 	* textmodes/artist.el (artist-butlast): Deleted.
@@ -53,6 +58,7 @@
 	* ffap.el (ffap-bindings): Make interactive and add an autoload
 	cookie.
 	(ffap-bindings): Doc fix, to reflect the above change.
+======= end
 
 2000-12-27  Kenichi Handa  <handa@etl.go.jp>
 
@@ -1198,6 +1204,7 @@
 	`verbatim' so that we don't inadvertently delete a non-existant
 	directory name.
 
+>>>>>>> 1.1768
 2000-11-27  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/characters.el: Specify cases and syntaxes for