From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 30 Apr 2014 18:01:36 +0000 (-0700)
Subject: Spelling fix, plus try to fix grammar in doc string.
X-Git-Tag: emacs-24.3.91~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=426b5dafdd837328d624a8ec5bfd567f2865c9f5;p=emacs.git

Spelling fix, plus try to fix grammar in doc string.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index df31e0dfbd8..7caba9a96c2 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1644,11 +1644,11 @@ function for its other effects."
 The following sources are applied in this order:
 
   face reset to default values if it's the default face, otherwise set
-  to unspecifed (through `face-spec-reset-face`)
+  to unspecified (through `face-spec-reset-face')
    |
   (theme and user customization)
-    or: if none of the above exist, do not match the current frame or
-        did inherit from the defface spec instead of overwriting it
+    or: if none of the above exist, and none match the current frame or
+        inherited from the defface spec instead of overwriting it
         entirely, the following is applied instead:
   (defface default spec)
   (X resources (if applicable))