diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-02-19 16:14:30 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-02-19 16:14:30 +0800 |
| commit | 20af23949ddcb8b4b2ca54c51911117415f2d46a (patch) | |
| tree | 0aa6a2789da0d3a072582fba6043693f60b76906 /lisp/vc/ediff-init.el | |
| parent | 5d55b248c3d92e48ed5f841463551f56610c754e (diff) | |
| download | emacs-20af23949ddcb8b4b2ca54c51911117415f2d46a.tar.gz | |
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/ediff-init.el')
| -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." ;; If ediff modified mode line, strip the modification (defsubst ediff-strip-mode-line-format () - (if (member (car mode-line-format) '(" A: " " B: " " C: " " Ancestor: ")) - (setq mode-line-format (nth 2 mode-line-format)))) + (and (consp mode-line-format) + (member (car mode-line-format) + '(" A: " " B: " " C: " " Ancestor: ")) + (setq mode-line-format (nth 2 mode-line-format)))) ;; Verify that we have a difference selected. (defsubst ediff-valid-difference-p (&optional n) |