Mercurial > emacs
diff lisp/ChangeLog @ 82491:962fb740e73f
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-856
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 21 Aug 2007 04:51:30 +0000 |
| parents | 458dcdfc3e27 06f0300fda43 |
| children | 3ecf9562ce0b 2a69b973fae2 aaccdab0ee26 |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Aug 20 23:28:16 2007 +0000 +++ b/lisp/ChangeLog Tue Aug 21 04:51:30 2007 +0000 @@ -1,3 +1,25 @@ +2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * smerge-mode.el (smerge-resolve): New arg `safe'. + (smerge-resolve-all, smerge-batch-resolve): New function. + (smerge-refine): Make sure `diff' returns the expected result. + (smerge-parsep-re): New const. + (smerge-mode): Use it to adjust paragraph-separate. + + * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords): + Correctly match / regexp matchers as first char on a line when + fontifying only that line. + + * emacs-lisp/cl-macs.el (cl-transform-lambda): Preserve the match-data. + +2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-bzr.el: Don't fiddle with vc-handled-backend. + (vc-bzr-registered): Don't redundantly protect against + file-error. Actually use the format-specific code. + (vc-bzr-buffer-nonblank-p): Remove. + (vc-bzr-status): Change `kindchange' -> `kindchanged'. + 2007-08-20 Juri Linkov <juri@jurta.org> * startup.el (fancy-splash-text): Change multiple tabs into one