diff options
| author | Martin Rudalics | 2011-10-30 09:29:56 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2011-10-30 09:29:56 +0100 |
| commit | 3d8daefefaf3bfd73ca4d8a363b044ec66a45e3a (patch) | |
| tree | 2dc57eb08f67ac05e46da3abb33071bc9b6cf738 /lisp/calendar | |
| parent | c1e2f5fa6977e86cf2797c4f4627e518b40c5182 (diff) | |
| download | emacs-3d8daefefaf3bfd73ca4d8a363b044ec66a45e3a.tar.gz emacs-3d8daefefaf3bfd73ca4d8a363b044ec66a45e3a.zip | |
Remove "iso-" infix from window combination functions.
* window.el (window-iso-combination-p, window-iso-combined-p)
(window-iso-combinations): Remove "iso-" infix. Suggested by
Chong Yidong.
(window-min-size-1, window-size-fixed-1, window-min-delta-1)
(window-max-delta-1, window-resize, window--resize-siblings)
(window--resize-this-window, adjust-window-trailing-edge)
(split-window, balance-windows-1)
(shrink-window-if-larger-than-buffer):
* calendar/calendar.el (calendar-generate-window):
* help.el (resize-temp-buffer-window): Adjust callers
accordingly.
* windows.texi (Windows and Frames): Remove "iso-" infix from
documentation of window-iso-combined-p.
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/calendar.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 6fa924dd788..a59e28811d3 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el | |||
| @@ -1373,7 +1373,7 @@ Optional integers MON and YR are used instead of today's date." | |||
| 1373 | ;; Don't do any window-related stuff if we weren't called from a | 1373 | ;; Don't do any window-related stuff if we weren't called from a |
| 1374 | ;; window displaying the calendar. | 1374 | ;; window displaying the calendar. |
| 1375 | (when in-calendar-window | 1375 | (when in-calendar-window |
| 1376 | (if (window-iso-combined-p) | 1376 | (if (window-combined-p) |
| 1377 | ;; Adjust the window to exactly fit the displayed calendar. | 1377 | ;; Adjust the window to exactly fit the displayed calendar. |
| 1378 | (fit-window-to-buffer nil nil calendar-minimum-window-height) | 1378 | (fit-window-to-buffer nil nil calendar-minimum-window-height) |
| 1379 | ;; For a full height window or a window that is horizontally | 1379 | ;; For a full height window or a window that is horizontally |