aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/faces.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 710cbcf8efa..17a8628b3d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-09-21 Stefan Monnier <monnier@iro.umontreal.ca> 12011-09-21 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * faces.el (face-list): Fix docstring (bug#9564).
4
3 * window.el (display-buffer--action-function-custom-type): 5 * window.el (display-buffer--action-function-custom-type):
4 Don't include internal functions in the Custom interface. 6 Don't include internal functions in the Custom interface.
5 7
diff --git a/lisp/faces.el b/lisp/faces.el
index fbe0f30ae6e..9a14e832065 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -119,7 +119,7 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
119 119
120 120
121(defun face-list () 121(defun face-list ()
122 "Return a list of all defined face names." 122 "Return a list of all defined faces."
123 (mapcar #'car face-new-frame-defaults)) 123 (mapcar #'car face-new-frame-defaults))
124 124
125 125