Merge from emacs--rel--22
commit341dd15a7bd9d0b4adff846e94289b3e1877eed1
authorMiles Bader <miles@gnu.org>
Sat, 26 Apr 2008 05:40:19 +0000 (26 05:40 +0000)
committerMiles Bader <miles@gnu.org>
Sat, 26 Apr 2008 05:40:19 +0000 (26 05:40 +0000)
tree7ee9a56e8c21e9fd498332b56dc1e3e00d46d9de
parent58a67d68bfc2eafe0cd029aa33693228f21f4e51
parent96ebc53904c3e1a9f0b31f77c51586e60f546fd6
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1129
lisp/ChangeLog
lisp/diff-mode.el