diff options
| author | Chong Yidong | 2012-02-19 16:14:30 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-02-19 16:14:30 +0800 |
| commit | 20af23949ddcb8b4b2ca54c51911117415f2d46a (patch) | |
| tree | 0aa6a2789da0d3a072582fba6043693f60b76906 /lisp/vc | |
| parent | 5d55b248c3d92e48ed5f841463551f56610c754e (diff) | |
| download | emacs-20af23949ddcb8b4b2ca54c51911117415f2d46a.tar.gz emacs-20af23949ddcb8b4b2ca54c51911117415f2d46a.zip | |
Fix mode-line-format handling bug in Ediff.
* lisp/vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list
mode-line formats.
Fixes: debbugs:10839
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff-init.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 806be855909..2de5e4dbdaf 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el | |||
| @@ -1743,8 +1743,10 @@ Unless optional argument INPLACE is non-nil, return a new string." | |||
| 1743 | 1743 | ||
| 1744 | ;; If ediff modified mode line, strip the modification | 1744 | ;; If ediff modified mode line, strip the modification |
| 1745 | (defsubst ediff-strip-mode-line-format () | 1745 | (defsubst ediff-strip-mode-line-format () |
| 1746 | (if (member (car mode-line-format) '(" A: " " B: " " C: " " Ancestor: ")) | 1746 | (and (consp mode-line-format) |
| 1747 | (setq mode-line-format (nth 2 mode-line-format)))) | 1747 | (member (car mode-line-format) |
| 1748 | '(" A: " " B: " " C: " " Ancestor: ")) | ||
| 1749 | (setq mode-line-format (nth 2 mode-line-format)))) | ||
| 1748 | 1750 | ||
| 1749 | ;; Verify that we have a difference selected. | 1751 | ;; Verify that we have a difference selected. |
| 1750 | (defsubst ediff-valid-difference-p (&optional n) | 1752 | (defsubst ediff-valid-difference-p (&optional n) |