diff options
| author | Joakim Verona | 2013-01-13 00:03:43 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-01-13 00:03:43 +0100 |
| commit | ec43cd5d7289dd1a994dc3517fccce1611966f89 (patch) | |
| tree | a52fa958b4c50e92932bcf5381f749a1846a908f /src/window.c | |
| parent | c655adbbab4baf73b652c86dcc53a2fc049ea7a5 (diff) | |
| parent | 71c661e4e6ab3857804113bc41fc2310343c9169 (diff) | |
| download | emacs-ec43cd5d7289dd1a994dc3517fccce1611966f89.tar.gz emacs-ec43cd5d7289dd1a994dc3517fccce1611966f89.zip | |
auto upstream
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index eafd6ef9e40..d38f4c10671 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1437,7 +1437,7 @@ window were selected. | |||
| 1437 | 1437 | ||
| 1438 | Note that, when WINDOW is selected, the value returned is the same as | 1438 | Note that, when WINDOW is selected, the value returned is the same as |
| 1439 | that returned by `point' for WINDOW's buffer. It would be more strictly | 1439 | that returned by `point' for WINDOW's buffer. It would be more strictly |
| 1440 | correct to return the `top-level' value of `point', outside of any | 1440 | correct to return the top-level value of `point', outside of any |
| 1441 | `save-excursion' forms. But that is hard to define. */) | 1441 | `save-excursion' forms. But that is hard to define. */) |
| 1442 | (Lisp_Object window) | 1442 | (Lisp_Object window) |
| 1443 | { | 1443 | { |
| @@ -6797,7 +6797,8 @@ same combination. | |||
| 6797 | 6797 | ||
| 6798 | Other values are reserved for future use. | 6798 | Other values are reserved for future use. |
| 6799 | 6799 | ||
| 6800 | This variable takes no effect if `window-combination-limit' is non-nil. */); | 6800 | This variable takes no effect if the variable `window-combination-limit' is |
| 6801 | non-nil. */); | ||
| 6801 | Vwindow_combination_resize = Qnil; | 6802 | Vwindow_combination_resize = Qnil; |
| 6802 | 6803 | ||
| 6803 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, | 6804 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, |