[Emacs-diffs] trunk r116937: Use `window-total-width' instead of `window-width'.

[Tassilo Horn]

------------------------------------------------------------
revno: 116937
revision-id: address@hidden
parent: address@hidden
author: Joost Kremers  <address@hidden>
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Fri 2014-04-04 14:10:22 +0200
message:
  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'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/textmodes/reftex-toc.el   
reftextoc.el-20091113204419-o5vbwnq5f7feedwu-1337

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-03 00:18:08 +0000
+++ b/lisp/ChangeLog    2014-04-04 12:10:22 +0000
@@ -1,3 +1,8 @@
+2014-04-04  Joost Kremers  <address@hidden>  (tiny change)
+
+       * textmodes/reftex-toc.el (reftex-toc, reftex-re-enlarge): Use
+       `window-total-width' instead of `window-width'.
+
 2014-04-03  Daniel Colascione  <address@hidden>
 
        * subr.el (set-transient-map): Remove rms's workaround entirely;

=== modified file 'lisp/textmodes/reftex-toc.el'
--- a/lisp/textmodes/reftex-toc.el      2014-03-29 00:53:32 +0000
+++ b/lisp/textmodes/reftex-toc.el      2014-04-04 12:10:22 +0000
@@ -241,13 +241,13 @@
                 (< (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 @@
 (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)