From: Joost Kremers Date: Fri, 4 Apr 2014 12:10:22 +0000 (+0200) Subject: Use `window-total-width' instead of `window-width'. X-Git-Tag: emacs-25.0.90~2640^2~270 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0de7d982ca1a9baab47c8a272230660b6ddb729b;p=emacs.git Use `window-total-width' instead of `window-width'. * textmodes/reftex-toc.el (reftex-toc, reftex-re-enlarge): Use `window-total-width' instead of `window-width'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c457ba6282..e428019139b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-04 Joost Kremers (tiny change) + + * textmodes/reftex-toc.el (reftex-toc, reftex-re-enlarge): Use + `window-total-width' instead of `window-width'. + 2014-04-03 Daniel Colascione * subr.el (set-transient-map): Remove rms's workaround entirely; diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index a35c2e114b4..e164770fa0c 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -241,13 +241,13 @@ When called with a raw C-u prefix, rescan the document first." (< (window-height) (* 2 window-min-height))) (delete-other-windows)) - (setq reftex-last-window-width (window-width) + (setq reftex-last-window-width (window-total-width) reftex-last-window-height (window-height)) ; remember (unless unsplittable (if reftex-toc-split-windows-horizontally (split-window-right - (floor (* (window-width) + (floor (* (window-total-width) reftex-toc-split-windows-fraction))) (split-window-below (floor (* (window-height) @@ -374,8 +374,8 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help (defun reftex-re-enlarge () "Enlarge window to a remembered size." (let ((count (if reftex-toc-split-windows-horizontally - (- (or reftex-last-window-width (window-width)) - (window-width)) + (- (or reftex-last-window-width (window-total-width)) + (window-total-width)) (- (or reftex-last-window-height (window-height)) (window-height))))) (when (> count 0)