diff options
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/textmodes/two-column.el | 8 |
2 files changed, 17 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 381092c8e60..9a40681aba8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2007-08-08 Martin Rudalics <rudalics@gmx.at> + + * dired.el (dired-pop-to-buffer): + * mouse-drag.el (mouse-drag-should-do-col-scrolling): + * calendar/calendar.el (generate-calendar-window): + * progmodes/compile.el (compilation-set-window-height): + * textmodes/two-column.el (2C-two-columns, 2C-merge): + Use window-full-width-p instead of comparing frame-width and + window-width. + + * progmodes/compile.el (compilation-find-buffer): Remove extra + argument in call to compilation-buffer-internal-p. + 2007-08-07 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-handle-file-remote-p): Handle optional diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 2568b53fe36..eebd1923b63 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -347,8 +347,8 @@ When called again, restores the screen layout with the current buffer first and the associated buffer to its right." (interactive "P") ;; first go to full width, so that we can certainly split into two windows - (if (< (window-width) (frame-width)) - (enlarge-window 99999 t)) + (unless (window-full-width-p) + (enlarge-window 99999 t)) (split-window-horizontally (max window-min-width (min 2C-window-width (- (frame-width) window-min-width)))) @@ -533,8 +533,8 @@ off trailing spaces with \\[delete-trailing-whitespace]." (insert 2C-separator string)) (next-line 1) ; add one if necessary (set-buffer b2)))) - (if (< (window-width) (frame-width)) - (enlarge-window 99999 t))) + (unless (window-full-width-p) + (enlarge-window 99999 t))) ;;;;; utility functions ;;;;; |