diff options
| author | Chong Yidong | 2012-07-21 14:13:23 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-07-21 14:13:23 +0800 |
| commit | 257210319f10abebbfd7c12784cf3a8e112c3562 (patch) | |
| tree | 48b747e691e6f8966d2a47cd4f57b0c1a1b01217 /src | |
| parent | 316e68a7952719c0450933eb956163ea4248d088 (diff) | |
| parent | 2c73e345cc666982dbcb9d73e4fdd5a3348d19bc (diff) | |
| download | emacs-257210319f10abebbfd7c12784cf3a8e112c3562.tar.gz emacs-257210319f10abebbfd7c12784cf3a8e112c3562.zip | |
Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 7fd66057ad2..3bf73134468 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -484,9 +484,7 @@ for future use. */) | |||
| 484 | (Lisp_Object window, Lisp_Object limit) | 484 | (Lisp_Object window, Lisp_Object limit) |
| 485 | { | 485 | { |
| 486 | register struct window *w = decode_any_window (window); | 486 | register struct window *w = decode_any_window (window); |
| 487 | |||
| 488 | w->combination_limit = limit; | 487 | w->combination_limit = limit; |
| 489 | |||
| 490 | return w->combination_limit; | 488 | return w->combination_limit; |
| 491 | } | 489 | } |
| 492 | 490 | ||