Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index 2a0b77b..f78a4cb 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1,6 +1,6 @@
 ;;; faces.el --- Lisp faces
 
-;; Copyright (C) 1992-1996, 1998-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1992-1996, 1998-2013 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -1622,7 +1622,7 @@ the face's attributes on existing frames."
   (if (memq spec-type '(reset saved-face))
       (put face 'customized-face nil))
   ;; Setting the face spec via Custom empties out any override spec,
-  ;; similar to how setting a variable via Custom changes its valus.
+  ;; similar to how setting a variable via Custom changes its values.
   (if (memq spec-type '(customized-face saved-face reset))
       (put face 'face-override-spec nil))
   ;; If we reset the face based on its custom spec, it is unmodified