[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/08/21 04:51:30

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11584
retrieving revision 1.11585
diff -u -b -r1.11584 -r1.11585
--- lisp/ChangeLog      20 Aug 2007 23:28:16 -0000      1.11584
+++ lisp/ChangeLog      21 Aug 2007 04:51:28 -0000      1.11585
@@ -1,3 +1,25 @@
+2007-08-20  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
 
        * startup.el (fancy-splash-text): Change multiple tabs into one