comparison 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
comparison
equal deleted inserted replaced
82490:458dcdfc3e27 82491:962fb740e73f
1 2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * smerge-mode.el (smerge-resolve): New arg `safe'.
4 (smerge-resolve-all, smerge-batch-resolve): New function.
5 (smerge-refine): Make sure `diff' returns the expected result.
6 (smerge-parsep-re): New const.
7 (smerge-mode): Use it to adjust paragraph-separate.
8
9 * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
10 Correctly match / regexp matchers as first char on a line when
11 fontifying only that line.
12
13 * emacs-lisp/cl-macs.el (cl-transform-lambda): Preserve the match-data.
14
15 2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca>
16
17 * vc-bzr.el: Don't fiddle with vc-handled-backend.
18 (vc-bzr-registered): Don't redundantly protect against
19 file-error. Actually use the format-specific code.
20 (vc-bzr-buffer-nonblank-p): Remove.
21 (vc-bzr-status): Change `kindchange' -> `kindchanged'.
22
1 2007-08-20 Juri Linkov <juri@jurta.org> 23 2007-08-20 Juri Linkov <juri@jurta.org>
2 24
3 * startup.el (fancy-splash-text): Change multiple tabs into one 25 * startup.el (fancy-splash-text): Change multiple tabs into one
4 tab. Remove "Useful File menu items" section (with "Exit Emacs" 26 tab. Remove "Useful File menu items" section (with "Exit Emacs"
5 and "Recover Crashed Session"). 27 and "Recover Crashed Session").