mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

(emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.

Browse Source 
(emerge-auto-advance, emerge-skip-prefers): Use force-mode-line-update.
(emerge-refresh-mode-line): Use force-mode-line-update.
This commit is contained in:
Karl Heuer 1995-04-25 22:23:02 +00:00
parent 3941fe2c64
commit ec165e569d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/emerge.el
View File

@ -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)