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 6c457ba62828e48cf41640bc4a2e375f5f499628..e428019139b9a6e294b94176c64d938367fe80e8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-04  Joost Kremers  <joostkremers@fastmail.fm>  (tiny change)
+
+       * textmodes/reftex-toc.el (reftex-toc, reftex-re-enlarge): Use
+       `window-total-width' instead of `window-width'.
+
 2014-04-03  Daniel Colascione  <dancol@dancol.org>
 
        * 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 a35c2e114b48be230cd60ded13bb0779069aff24..e164770fa0c1ce0cdaaf99af725a46caae2a9a4e 100644 (file)
--- 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)