projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed.
[riece]
/
lisp
/
riece-layout.el
diff --git
a/lisp/riece-layout.el
b/lisp/riece-layout.el
index
e1c6908
..
05bdabd
100644
(file)
--- a/
lisp/riece-layout.el
+++ b/
lisp/riece-layout.el
@@
-49,8
+49,8
@@
"An alist mapping the names to layout functions.
An element of this alist is either in the following forms:
"An alist mapping the names to layout functions.
An element of this alist is either in the following forms:
-
(NAME CONFIGURE-FUNCTION [PARAMETERS]
)
-
(NAME1 . NAME2
)
+
\(NAME CONFIGURE-FUNCTION [PARAMETERS]\
)
+
\(NAME1 . NAME2\
)
In the first form, NAME is a string which specifies the layout
setting, and CONFIGURE-FUNCTION is a function which does window
In the first form, NAME is a string which specifies the layout
setting, and CONFIGURE-FUNCTION is a function which does window
@@
-72,7
+72,7
@@
happen unconditionally."
(if (or force
(riece-reconfigure-windows-predicate))
(apply (car layout) (cdr layout))))))
(if (or force
(riece-reconfigure-windows-predicate))
(apply (car layout) (cdr layout))))))
-
+
(defun riece-set-window-points ()
(if (get-buffer-window riece-user-list-buffer)
(with-current-buffer riece-user-list-buffer
(defun riece-set-window-points ()
(if (get-buffer-window riece-user-list-buffer)
(with-current-buffer riece-user-list-buffer
@@
-87,7
+87,10
@@
happen unconditionally."
(if (and riece-channel-buffer
(get-buffer-window riece-channel-buffer))
(with-current-buffer riece-channel-buffer
(if (and riece-channel-buffer
(get-buffer-window riece-channel-buffer))
(with-current-buffer riece-channel-buffer
- (unless (riece-frozen riece-channel-buffer)
+ (if (riece-frozen riece-channel-buffer)
+ (if riece-channel-buffer-window-point
+ (set-window-point (get-buffer-window riece-channel-buffer)
+ riece-channel-buffer-window-point))
(set-window-point (get-buffer-window riece-channel-buffer)
(point-max)))))
(if (get-buffer-window riece-others-buffer)
(set-window-point (get-buffer-window riece-channel-buffer)
(point-max)))))
(if (get-buffer-window riece-others-buffer)
@@
-169,11
+172,7
@@
This function is used by \"default\" layout."
(set-window-buffer (split-window)
riece-channel-buffer)
(set-window-buffer rest-window
(set-window-buffer (split-window)
riece-channel-buffer)
(set-window-buffer rest-window
- riece-command-buffer))))
- (with-current-buffer riece-channel-buffer
- (setq truncate-partial-width-windows nil))
- (with-current-buffer riece-others-buffer
- (setq truncate-partial-width-windows nil)))
+ riece-command-buffer)))))
(if (eq vpos 'bottom)
(progn
(set-window-buffer (selected-window)
(if (eq vpos 'bottom)
(progn
(set-window-buffer (selected-window)
@@
-224,8
+223,7
@@
PLIST accept :command-height, :user-list-width, and :channel-list-width."
(set-window-buffer (selected-window) riece-channel-buffer)
(set-window-buffer user-list-window riece-user-list-buffer)
(select-window user-list-window)
(set-window-buffer (selected-window) riece-channel-buffer)
(set-window-buffer user-list-window riece-user-list-buffer)
(select-window user-list-window)
- (shrink-window-horizontally (- (window-width) user-list-width))
- (setq truncate-partial-width-windows nil)))
+ (shrink-window-horizontally (- (window-width) user-list-width))))
;; only user-list
(show-user-list
(set-window-buffer (selected-window) riece-user-list-buffer))
;; only user-list
(show-user-list
(set-window-buffer (selected-window) riece-user-list-buffer))
@@
-240,8
+238,7
@@
PLIST accept :command-height, :user-list-width, and :channel-list-width."
(set-window-buffer (selected-window) riece-others-buffer)
(set-window-buffer channel-list-window riece-channel-list-buffer)
(select-window channel-list-window)
(set-window-buffer (selected-window) riece-others-buffer)
(set-window-buffer channel-list-window riece-channel-list-buffer)
(select-window channel-list-window)
- (shrink-window-horizontally (- (window-width) channel-list-width))
- (setq truncate-partial-width-windows nil))
+ (shrink-window-horizontally (- (window-width) channel-list-width)))
(set-window-buffer (selected-window) riece-dialogue-buffer))
(riece-set-window-points)
(select-window (or (get-buffer-window buffer)
(set-window-buffer (selected-window) riece-dialogue-buffer))
(riece-set-window-points)
(select-window (or (get-buffer-window buffer)