Merge from origin/emacs-25

[gnu-emacs] / lisp / progmodes / cc-bytecomp.el

diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 1470b080264b9c99a1f844fc25175e1696ac8179..47ff8e437214859801ab36f5121bde5f32b68b49 100644 (file)
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -1,6 +1,6 @@
 ;;; cc-bytecomp.el --- compile time setup for proper compilation
 
-;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2016 Free Software Foundation, Inc.
 
 ;; Author:     Martin Stjernholm
 ;; Maintainer: bug-cc-mode@gnu.org
@@ -315,7 +315,7 @@ CONDITION should not be quoted."
     '(progn)))
 
 (defmacro cc-conditional-require-after-load (cc-part file condition)
-  "If the CONDITION is satified at compile time, (i) force the
+  "If the CONDITION is satisfied at compile time, (i) force the
 file CC-PART.el in the current directory to be loaded at compile
 time, (ii) generate an `eval-after-load' form to load CC-PART.el
 after the loading of FILE.