[Emacs-diffs] /srv/bzr/emacs/trunk r107335: Fix mode-line-format handling bug in Ediff.

[Chong Yidong]

------------------------------------------------------------
revno: 107335
fixes bug(s): http://debbugs.gnu.org/10839
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-19 16:14:30 +0800
message:
  Fix mode-line-format handling bug in Ediff.
  
  * lisp/vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list
  mode-line formats.
modified:
  lisp/ChangeLog
  lisp/mail/rmail.el
  lisp/vc/ediff-init.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-18 21:57:00 +0000
+++ b/lisp/ChangeLog    2012-02-19 08:14:30 +0000
@@ -1,3 +1,8 @@
+2012-02-19  Chong Yidong  <address@hidden>
+
+       * vc/ediff-init.el (ediff-strip-mode-line-format): Handle non-list
+       mode-line formats (Bug#10839).
+
 2012-02-18  Glenn Morris  <address@hidden>
 
        * mail/rmail.el (rmail-dont-reply-to-names): Mark as obsolete.

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2012-02-18 21:57:00 +0000
+++ b/lisp/mail/rmail.el        2012-02-19 08:14:30 +0000
@@ -4700,7 +4700,7 @@
 ;;;***
 
 ;;;### (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 @@
 
 (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)
 

=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el     2012-01-19 07:21:25 +0000
+++ b/lisp/vc/ediff-init.el     2012-02-19 08:14:30 +0000
@@ -1743,8 +1743,10 @@
 
 ;; 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)