# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1134324840 0
# Node ID 22cb493256c09062680a298c6f1ec9e962e8d443
# Parent  815e534890e92917c4e080cacff078ca5d06555e
*** empty log message ***

diff -r 815e534890e9 -r 22cb493256c0 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Dec 11 15:40:37 2005 +0000
+++ b/lisp/ChangeLog	Sun Dec 11 18:14:00 2005 +0000
@@ -1,3 +1,11 @@
+2005-12-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* cus-edit.el (customize-apropos): Avoid listing an option more
+	than once under different aliases.  No longer list user options
+	that are not defined with defcustom (unless a prefix arg is given).
+	Doc fix.
+	(customize-apropos-options): Doc fix.
+
 2005-12-11  Juri Linkov  <juri@jurta.org>
 
 	* frame.el (set-background-color, set-foreground-color)