aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorMiles Bader2006-08-16 14:08:49 +0000
committerMiles Bader2006-08-16 14:08:49 +0000
commitde20e0ccdb039a2ac27e5bbd3e06ab70c4e7bb65 (patch)
tree80243ce02b52cbf7945c614bd213dd63142b861a /lisp/faces.el
parent7a5c2a42040b12b037940a067aee6ac6fde01680 (diff)
parent5ebdc2990a95cc38b21f772eea4de3ceee149e54 (diff)
downloademacs-de20e0ccdb039a2ac27e5bbd3e06ab70c4e7bb65.tar.gz
emacs-de20e0ccdb039a2ac27e5bbd3e06ab70c4e7bb65.zip
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 382-398) - Update from CVS - Update from erc--emacs--22 - Fix ERC bug introduced in last patch - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 123-125) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 4627b5ff594..f2d3e0ddb44 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2066,7 +2066,7 @@ created."
2066 ;; red4 is too dark, but some say blue is too loud. 2066 ;; red4 is too dark, but some say blue is too loud.
2067 ;; brown seems to work ok. -- rms. 2067 ;; brown seems to work ok. -- rms.
2068 (t :foreground "brown")) 2068 (t :foreground "brown"))
2069 "Face for characters displayed as ^-sequences or \-sequences." 2069 "Face for characters displayed as sequences using `^' or `\\'."
2070 :group 'basic-faces 2070 :group 'basic-faces
2071 :version "22.1") 2071 :version "22.1")
2072 2072