# HG changeset patch # User Karl Heuer # Date 798848582 0 # Node ID 26d4ff74d4ab2e5b2bd12918a3a91b4c76574058 # Parent 63215d2a1e3f70ba37f10cffa7484b2991eed8ca (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. diff -r 63215d2a1e3f -r 26d4ff74d4ab lisp/emerge.el --- a/lisp/emerge.el Tue Apr 25 22:22:21 1995 +0000 +++ b/lisp/emerge.el Tue Apr 25 22:23:02 1995 +0000 @@ -1980,8 +1980,7 @@ (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 @@ (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 @@ (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 @@ (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 @@ (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)