Commit 20af2394 authored by Chong Yidong's avatar Chong Yidong
Browse files

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
parent 5d55b248
2012-02-19 Chong Yidong <cyd@gnu.org>
* vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list
mode-line formats (Bug#10839).
2012-02-18 Glenn Morris <rgm@gnu.org>
* mail/rmail.el (rmail-dont-reply-to-names): Mark as obsolete.
......
......@@ -4700,7 +4700,7 @@ SENDERS is a string of regexps separated by commas.
;;;***
;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
;;;;;; "undigest" "undigest.el" "1be42b2d20b13004f0ad1b504630ed00")
;;;;;; "undigest" "undigest.el" "a31a35802a2adbc51be42959c3043dbd")
;;; Generated autoloads from undigest.el
(autoload 'undigestify-rmail-message "undigest" "\
......@@ -4711,8 +4711,9 @@ Leaves original message, deleted, before the undigestified messages.
(autoload 'unforward-rmail-message "undigest" "\
Extract a forwarded message from the containing message.
This puts the forwarded message into a separate rmail message
following the containing message.
This puts the forwarded message into a separate rmail message following
the containing message. This command is only useful when messages are
forwarded with `rmail-enable-mime-composing' set to nil.
\(fn)" t nil)
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment