# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1121278927 0
# Node ID e28b95ace307523de4d72c3c7e629b2e58c6ca80
# Parent  0f6e11b0a48666c2354a03feb1e9f01a1e9b9bf0
*** empty log message ***

diff -r 0f6e11b0a486 -r e28b95ace307 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jul 13 17:48:37 2005 +0000
+++ b/lisp/ChangeLog	Wed Jul 13 18:22:07 2005 +0000
@@ -44,8 +44,8 @@
 	* term/mac-win.el (ccl-encode-mac-roman-font)
 	(ccl-encode-mac-centraleurroman-font)
 	(ccl-encode-mac-cyrillic-font, ccl-encode-mac-symbol-font):
-	(ccl-encode-mac-dingbats-font): Remove check for ASCII.  Change
-	charset-id boundary of dimension to ?\xef.
+	(ccl-encode-mac-dingbats-font): Remove check for ASCII.
+	Change charset-id boundary of dimension to ?\xef.
 	(mac-char-fontspec-list): New constant.
 	(fontset-add-mac-fonts): Use it.  Accept non-string `base-family'
 	argument.  Nil uses itself as family in font-spec.  Previous
@@ -311,6 +311,11 @@
 	(ido-buffer-internal, ido-file-internal, ido-read-buffer)
 	(ido-read-file-name): Run it.
 
+2005-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/hideif.el (hide-ifdef-use-define-alist): Pass a list of
+	strings rather than a list of symbols to the completion function.
+
 2005-07-07  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc-units.el (math-apply-units):  Change the places in