procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the ediff control panel mode line prettier

Browse source 
* lisp/vc/ediff-wind.el (ediff-refresh-mode-lines): Don't include
"Quick Help" in the mode line in the plain version (bug#12840).
(ediff-make-wide-control-buffer-id): Make the informative part of
the mode line bold.  (Code from Michael Heerdegen.)
This commit is contained in:
Lars Ingebrigtsen 2022-06-13 15:49:56 +02:00
parent 18f5984c65
commit 27600ad673
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lisp/vc/ediff-wind.el
View file

@ -1135,7 +1135,10 @@ It assumes that it is called from within the control buffer."
(setq mode-line-format
(if (ediff-narrow-control-frame-p)
(list " " mode-line-buffer-identification)
(list "-- " mode-line-buffer-identification " Quick Help")))
(list "-- " mode-line-buffer-identification
(and (not (eq ediff-window-setup-function
'ediff-setup-windows-plain))
" Quick Help"))))
;; control buffer id
(setq mode-line-buffer-identification
(if (ediff-narrow-control-frame-p)
@ -1213,18 +1216,20 @@ It assumes that it is called from within the control buffer."
ediff-control-buffer-suffix))
(defun ediff-make-wide-control-buffer-id ()
(cond ((< ediff-current-difference 0)
(list (format "%%b At start of %d diffs"
ediff-number-of-differences)))
((>= ediff-current-difference ediff-number-of-differences)
(list (format "%%b At end of %d diffs"
ediff-number-of-differences)))
(t
(list (format "%%b diff %d of %d"
(1+ ediff-current-difference)
ediff-number-of-differences)))))
(list
(concat "%b "
(propertize
(cond ((< ediff-current-difference 0)
(format "At start of %d diffs"
ediff-number-of-differences))
((>= ediff-current-difference ediff-number-of-differences)
(format "At end of %d diffs"
ediff-number-of-differences))
(t
(format "diff %d of %d"
(1+ ediff-current-difference)
ediff-number-of-differences)))
'face 'mode-line-buffer-id))))
;; If buff is not live, return nil
(defun ediff-get-visible-buffer-window (buff)