From: Luc Teirlinck <teirllm@auburn.edu>
Date: Sun, 11 Dec 2005 18:14:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~5337
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39f617e5f7de8dddcdbc3e309dbff953494ea722;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fe14112305..81aa49995cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)