merge trunk

[gnu-emacs] / src / frame.h

diff --git a/src/frame.h b/src/frame.h
index e096807b02ec5754ac1d2627cd750f52076c750b..5c89fc69628fc7c22254375b38ad99aad29d2c80 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,5 +1,5 @@
 /* Define frame-object for GNU Emacs.
 /* Define frame-object for GNU Emacs.

-   Copyright (C) 1993-1994, 1999-2011 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 1999-2012 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 


@@ -371,7 +371,7 @@ struct frame
      if greater than 1, then the frame is obscured - we still consider
      it to be "visible" as seen from lisp, but we don't bother
      updating it.  We must take care to garbage the frame when it
      if greater than 1, then the frame is obscured - we still consider
      it to be "visible" as seen from lisp, but we don't bother
      updating it.  We must take care to garbage the frame when it

-     ceaces to be obscured though.
+     ceases to be obscured though.

 
      iconified is nonzero if the frame is currently iconified.
 
 
      iconified is nonzero if the frame is currently iconified.