diff options
| author | Joakim Verona | 2013-08-13 20:16:27 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 20:16:27 +0200 |
| commit | f0a5c7bd7d1654efded1a93b71b662d815d18ef8 (patch) | |
| tree | bd88eee45b947609040743fb00ca7104ae3689df /src/window.c | |
| parent | a218d7fbf59ed0896f02bf50ed1702c26696cd30 (diff) | |
| parent | 21c58ae2a804b00812d3e609806326ac5d301e34 (diff) | |
| download | emacs-f0a5c7bd7d1654efded1a93b71b662d815d18ef8.tar.gz emacs-f0a5c7bd7d1654efded1a93b71b662d815d18ef8.zip | |
merge from trunk
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 9d4bb4d4e11..d5f872125fa 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -6177,8 +6177,8 @@ as nil. */) | |||
| 6177 | (Lisp_Object window) | 6177 | (Lisp_Object window) |
| 6178 | { | 6178 | { |
| 6179 | struct window *w = decode_live_window (window); | 6179 | struct window *w = decode_live_window (window); |
| 6180 | return Fcons (make_number (w->left_margin_cols), | 6180 | return Fcons (w->left_margin_cols ? make_number (w->left_margin_cols) : Qnil, |
| 6181 | make_number (w->right_margin_cols)); | 6181 | w->right_margin_cols ? make_number (w->right_margin_cols) : Qnil); |
| 6182 | } | 6182 | } |
| 6183 | 6183 | ||
| 6184 | 6184 | ||