mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix some issues with `window-divider-mode'

Browse source 
* lisp/frame.el (window-divider-default-places): New option.
(window-divider-mode): Remove option.
(window-divider-mode): Make it a "regular" minor mode.
(window-divider-width-valid-p): Drop frame- prefix.
(window-divider-mode-apply): New argument ENABLE.  Drop frame-
prefix.  Handle `window-divider-default-places'.
(frame--window-divider-mode-set-and-apply): Remove.
(window-divider-default-bottom-width)
(window-divider-default-right-width): Drop :group entries.
* lisp/menu-bar.el (menu-bar-bottom-and-right-window-divider)
(menu-bar-right-window-divider, menu-bar-bottom-window-divider)
(menu-bar-no-window-divider): Set `window-divider-default-places'
and call `window-divider-mode'.
* doc/emacs/frames.texi (Window Dividers): Document
`window-divider-default-places'.
This commit is contained in:
Martin Rudalics 2015-07-03 15:15:51 +02:00
parent 2b848fadd5
commit e3c4cd0074
3 changed files with 71 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lisp/menu-bar.el
View file

@ -719,22 +719,25 @@ by \"Save Options\" in Custom buffers.")
(defun menu-bar-bottom-and-right-window-divider ()
"Display dividers on the bottom and right of each window."
(interactive)
(customize-set-variable 'window-divider-mode t))
(customize-set-variable 'window-divider-default-places t)
(window-divider-mode 1))
(defun menu-bar-right-window-divider ()
"Display dividers only on the right of each window."
(interactive)
(customize-set-variable 'window-divider-mode 'right-only))
(customize-set-variable 'window-divider-default-places 'right-only)
(window-divider-mode 1))
(defun menu-bar-bottom-window-divider ()
"Display dividers only at the bottom of each window."
(interactive)
(customize-set-variable 'window-divider-mode 'bottom-only))
(customize-set-variable 'window-divider-default-places 'bottom-only)
(window-divider-mode 1))
(defun menu-bar-no-window-divider ()
"Do not display window dividers."
(interactive)
(customize-set-variable 'window-divider-mode nil))
(window-divider-mode -1))
;; For the radio buttons below we check whether the respective dividers
;; are displayed on the selected frame. This is not fully congruent
@ -753,10 +756,10 @@ by \"Save Options\" in Custom buffers.")
:help "Display window divider on the bottom and right of each window"
:visible (memq (window-system) '(x w32))
:button (:radio
. (and (frame-window-divider-width-valid-p
. (and (window-divider-width-valid-p
(cdr (assq 'bottom-divider-width
(frame-parameters))))
(frame-window-divider-width-valid-p
(window-divider-width-valid-p
(cdr (assq 'right-divider-width
(frame-parameters))))))))
(bindings--define-key menu [right-only]
@ -765,10 +768,10 @@ by \"Save Options\" in Custom buffers.")
:help "Display window divider on the right of each window only"
:visible (memq (window-system) '(x w32))
:button (:radio
. (and (not (frame-window-divider-width-valid-p
. (and (not (window-divider-width-valid-p
(cdr (assq 'bottom-divider-width
(frame-parameters)))))
(frame-window-divider-width-valid-p
(window-divider-width-valid-p
(cdr (assq 'right-divider-width
(frame-parameters))))))))
(bindings--define-key menu [bottom-only]
@ -777,10 +780,10 @@ by \"Save Options\" in Custom buffers.")
:help "Display window divider on the bottom of each window only"
:visible (memq (window-system) '(x w32))
:button (:radio
. (and (frame-window-divider-width-valid-p
. (and (window-divider-width-valid-p
(cdr (assq 'bottom-divider-width
(frame-parameters))))
(not (frame-window-divider-width-valid-p
(not (window-divider-width-valid-p
(cdr (assq 'right-divider-width
(frame-parameters)))))))))
(bindings--define-key menu [no-divider]
@ -789,10 +792,10 @@ by \"Save Options\" in Custom buffers.")
:help "Do not display window dividers"
:visible (memq (window-system) '(x w32))
:button (:radio
. (and (not (frame-window-divider-width-valid-p
. (and (not (window-divider-width-valid-p
(cdr (assq 'bottom-divider-width
(frame-parameters)))))
(not (frame-window-divider-width-valid-p
(not (window-divider-width-valid-p
(cdr (assq 'right-divider-width
(frame-parameters)))))))))
menu))