diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-04-25 22:23:02 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-04-25 22:23:02 +0000 |
| commit | fe317dcb640ee5a5f07f969e1a13a71b19709fa0 (patch) | |
| tree | 27e0ed3b4514f8091a7f73837ab10824d93b34e1 /lisp/emerge.el | |
| parent | 6108a67a84223397b25f6076e2d8a131bbbb56de (diff) | |
| download | emacs-fe317dcb640ee5a5f07f969e1a13a71b19709fa0.tar.gz | |
(emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.
(emerge-auto-advance, emerge-skip-prefers): Use force-mode-line-update.
(emerge-refresh-mode-line): Use force-mode-line-update.
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index 15118a0ab6a..17eb6f86ca1 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -1980,8 +1980,7 @@ need not be prefixed with \\<emerge-fast-keymap>\\[emerge-basic-keymap]." (setq emerge-fast-mode t) (setq emerge-edit-mode nil) (message "Fast mode set") - ;; force mode line redisplay - (set-buffer-modified-p (buffer-modified-p))) + (force-mode-line-update)) (defun emerge-edit-mode () "Set edit mode, for Emerge. @@ -1994,8 +1993,7 @@ must be prefixed with \\<emerge-fast-keymap>\\[emerge-basic-keymap]." (setq emerge-fast-mode nil) (setq emerge-edit-mode t) (message "Edit mode set") - ;; force mode line redisplay - (set-buffer-modified-p (buffer-modified-p))) + (force-mode-line-update)) (defun emerge-auto-advance (arg) "Toggle Auto-Advance mode, for Emerge. @@ -2010,8 +2008,7 @@ With a negative argument, turn off Auto-Advance mode." (message (if emerge-auto-advance "Auto-advance set" "Auto-advance cleared")) - ;; force mode line redisplay - (set-buffer-modified-p (buffer-modified-p))) + (force-mode-line-update)) (defun emerge-skip-prefers (arg) "Toggle Skip-Prefers mode, for Emerge. @@ -2026,8 +2023,7 @@ With a negative argument, turn off Skip-Prefers mode." (message (if emerge-skip-prefers "Skip-prefers set" "Skip-prefers cleared")) - ;; force mode line redisplay - (set-buffer-modified-p (buffer-modified-p))) + (force-mode-line-update)) (defun emerge-copy-as-kill-A () "Put the A variant of this difference in the kill ring." @@ -2803,8 +2799,7 @@ keymap. Leaves merge in fast mode." (prefer-B . " - B*") (combined . " - comb")))) "")))) - ;; Force mode-line redisplay - (set-buffer-modified-p (buffer-modified-p))) + (force-mode-line-update)) ;; compare two regions in two buffers for containing the same text (defun emerge-compare-buffers (buffer-x x-begin x-end buffer-y y-begin y-end) |