aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2007-02-01 00:39:02 +0000
committerJuanma Barranquero2007-02-01 00:39:02 +0000
commit39a897a583050f5d994e00c829513c647b356cdb (patch)
tree13af43a9876bfa5648f7c03377788a568675e237 /lisp
parent5de4980c740cf1a1316d104f65bf2b43cb5ecb3b (diff)
downloademacs-39a897a583050f5d994e00c829513c647b356cdb.tar.gz
emacs-39a897a583050f5d994e00c829513c647b356cdb.zip
(internal-find-face, internal-get-face): Doc fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el12
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3385b372283..3c3e6f4dc01 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-02-01 Juanma Barranquero <lekktu@gmail.com>
2
3 * faces.el (internal-find-face, internal-get-face): Doc fixes.
4
12007-01-31 Juanma Barranquero <lekktu@gmail.com> 52007-01-31 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * ido.el (ido-set-common-completion): Use `let', not `let*'. 7 * ido.el (ido-set-common-completion): Use `let', not `let*'.
diff --git a/lisp/faces.el b/lisp/faces.el
index 53e3b004533..6cf5d4f4d1c 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -181,20 +181,16 @@ to NEW-FACE on frame NEW-FRAME."
181(defun internal-find-face (name &optional frame) 181(defun internal-find-face (name &optional frame)
182 "Retrieve the face named NAME. 182 "Retrieve the face named NAME.
183Return nil if there is no such face. 183Return nil if there is no such face.
184If the optional argument FRAME is given, this gets the face NAME for 184If NAME is already a face, it is simply returned.
185that frame; otherwise, it uses the selected frame. 185The optional argument FRAME is ignored."
186If FRAME is the symbol t, then the global, non-frame face is returned.
187If NAME is already a face, it is simply returned."
188 (facep name)) 186 (facep name))
189(make-obsolete 'internal-find-face 'facep "21.1") 187(make-obsolete 'internal-find-face 'facep "21.1")
190 188
191 189
192(defun internal-get-face (name &optional frame) 190(defun internal-get-face (name &optional frame)
193 "Retrieve the face named NAME; error if there is none. 191 "Retrieve the face named NAME; error if there is none.
194If the optional argument FRAME is given, this gets the face NAME for 192If NAME is already a face, it is simply returned.
195that frame; otherwise, it uses the selected frame. 193The optional argument FRAME is ignored."
196If FRAME is the symbol t, then the global, non-frame face is returned.
197If NAME is already a face, it is simply returned."
198 (or (facep name) 194 (or (facep name)
199 (check-face name))) 195 (check-face name)))
200(make-obsolete 'internal-get-face "see `facep' and `check-face'." "21.1") 196(make-obsolete 'internal-get-face "see `facep' and `check-face'." "21.1")