diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2011-11-16 13:34:47 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2011-11-16 13:34:47 +0100 |
| commit | 58179ccebd1c2fd18fa422a7bb4d2cf78994e3c9 (patch) | |
| tree | b5c96cf9f1cc1c0c78ed998040e40ab126da95bb /src | |
| parent | 110490118ed91082753d0f9e15d1774b6002caa2 (diff) | |
| download | emacs-58179ccebd1c2fd18fa422a7bb4d2cf78994e3c9.tar.gz | |
Fix typos.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/window.c | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0cbf2274ff9..0a3758d6bfd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * window.c (syms_of_window) <window-combination-limit>: Fix typo. + 2011-11-16 Martin Rudalics <rudalics@gmx.at> * window.h (window): Rename slot "nest" to "combination_limit". @@ -259,7 +263,7 @@ * w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version. -2011-11-05 Fabrice Popineau <fabrice.popineau@supelec.fr> (tiny change) +2011-11-05 Fabrice Popineau <fabrice.popineau@supelec.fr> (tiny change) Support MSVC build with newer versions of Visual Studio. * w32.c: Don't include w32api.h for MSVC. @@ -321,7 +325,7 @@ * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented past the beginning of the current glyph matrix. -2011-10-30 Adam Sjøgren <asjo@koldfront.dk> (tiny change) +2011-10-30 Adam Sjøgren <asjo@koldfront.dk> (tiny change) * xterm.c: Include X11/Xproto.h if HAVE_GTK3. (x_error_handler): Ignore BadMatch for X_SetInputFocus for @@ -3049,7 +3053,7 @@ * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods cString and lossyCString on OSX >= 10.4 - * nsmenu.m (fillWithWidgetValue): Don't use depercated method + * nsmenu.m (fillWithWidgetValue): Don't use deprecated method sizeToFit on OSX >= 10.2. * nsimage.m (allocInitFromFile): Don't use deprecated method diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index 830905cd0b5..efe77648458 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 @@ -405,7 +405,7 @@ Copy their own header field a_scovfrl from ohdr. * unexec.c [COFF]: - Round positions of text and and data sections in output file + Round positions of text and data sections in output file to page boundaries. * crt0.c: Install version for Encore machines. diff --git a/src/frame.c b/src/frame.c index d56a2efb17f..ab60fd5b808 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1237,7 +1237,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) else { #ifdef HAVE_X_WINDOWS - /* Also, save clipboard to the the clipboard manager. */ + /* Also, save clipboard to the clipboard manager. */ x_clipboard_manager_save_frame (frame); #endif diff --git a/src/window.c b/src/window.c index 1b344773b1a..b34101c2f91 100644 --- a/src/window.c +++ b/src/window.c @@ -6506,7 +6506,7 @@ This variable takes no effect if `window-combination-limit' is non-nil. */); doc: /* Non-nil means splitting a window makes a new parent window. If this variable is nil, splitting a window will create a new parent window only if the window has no parent window or the window shall -become a combination orthogonal to the one it it is part of. +become a combination orthogonal to the one it is part of. If this variable is t, splitting a window always creates a new parent window. If all splits behave this way, each frame's window tree is a @@ -6515,7 +6515,7 @@ sibling. Other values are reserved for future use. -The value of this variable is also assigned to the combination_limit +The value of this variable is also assigned to the combination-limit status of the new parent window. The combination-limit status of a window can be retrieved via the function `window-combination-limit' and altered by the function `set-window-combination-limit'. */); |