aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-06-18 12:52:07 +0200
committerJuanma Barranquero2013-06-18 12:52:07 +0200
commit58aa805b97182b8cd94928d88520ae0aa4edbbb7 (patch)
treeeb8eb433be82d368cc7d9cd4601aff2d5040fa26
parentf462d10ac4f144ccd0833b4e745f7f51aa3eb1bb (diff)
downloademacs-58aa805b97182b8cd94928d88520ae0aa4edbbb7.tar.gz
emacs-58aa805b97182b8cd94928d88520ae0aa4edbbb7.zip
lisp/face-remap.el (buffer-face-toggle): Fix typo in docstring.
(buffer-face-mode-invoke): Doc fix.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/face-remap.el14
2 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bcfb24f0d19..a9a41554128 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-06-18 Juanma Barranquero <lekktu@gmail.com>
2
3 * face-remap.el (buffer-face-toggle): Fix typo in docstring.
4 (buffer-face-mode-invoke): Doc fix.
5
12013-06-18 Matthias Meulien <orontee@gmail.com> 62013-06-18 Matthias Meulien <orontee@gmail.com>
2 7
3 * tabify.el (untabify, tabify): With prefix, apply to entire buffer. 8 * tabify.el (untabify, tabify): With prefix, apply to entire buffer.
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index b620d01d83e..e4ec602efe7 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -72,7 +72,7 @@
72 :font :inherit :fontset :vector]) 72 :font :inherit :fontset :vector])
73 73
74(defun face-attrs-more-relative-p (attrs1 attrs2) 74(defun face-attrs-more-relative-p (attrs1 attrs2)
75"Return true if ATTRS1 contains a greater number of relative 75 "Return true if ATTRS1 contains a greater number of relative
76face-attributes than ATTRS2. A face attribute is considered 76face-attributes than ATTRS2. A face attribute is considered
77relative if `face-attribute-relative-p' returns non-nil. 77relative if `face-attribute-relative-p' returns non-nil.
78 78
@@ -395,9 +395,9 @@ one face is listed, that specifies an aggregate face, like in a
395`face' text property. 395`face' text property.
396 396
397If `buffer-face-mode' is already enabled, and is currently using 397If `buffer-face-mode' is already enabled, and is currently using
398the face specs SPECS, then it is disabled; if buffer-face-mode is 398the face specs SPECS, then it is disabled; if `buffer-face-mode'
399disabled, or is enabled and currently displaying some other face, 399is disabled, or is enabled and currently displaying some other
400then is left enabled, but the face changed to reflect SPECS. 400face, then is left enabled, but the face changed to reflect SPECS.
401 401
402This function will make the variable `buffer-face-mode-face' 402This function will make the variable `buffer-face-mode-face'
403buffer local, and set it to SPECS." 403buffer local, and set it to SPECS."
@@ -411,13 +411,13 @@ buffer local, and set it to SPECS."
411 (buffer-face-mode t))) 411 (buffer-face-mode t)))
412 412
413(defun buffer-face-mode-invoke (specs arg &optional interactive) 413(defun buffer-face-mode-invoke (specs arg &optional interactive)
414 "Enable or disable `buffer-face-mode' using face specs SPECS, and argument ARG. 414 "Enable or disable `buffer-face-mode' using face specs SPECS.
415ARG controls whether the mode is enabled or disabled, and is 415ARG controls whether the mode is enabled or disabled, and is
416interpreted in the usual manner for minor-mode commands. 416interpreted in the usual manner for minor-mode commands.
417 417
418SPECS can be any value suitable for a `face' text property, 418SPECS can be any value suitable for a `face' text property,
419including a face name, a plist of face attributes and values, or 419including a face name, a plist of face attributes and values,
420a list of faces. 420or a list of faces.
421 421
422If INTERACTIVE is non-nil, display a message describing the 422If INTERACTIVE is non-nil, display a message describing the
423result. 423result.