[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v |
Date: |
Mon, 12 May 2008 18:21:27 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/05/12 18:21:25
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13724
retrieving revision 1.13725
diff -u -b -r1.13724 -r1.13725
--- ChangeLog 12 May 2008 16:37:25 -0000 1.13724
+++ ChangeLog 12 May 2008 18:21:22 -0000 1.13725
@@ -1,3 +1,8 @@
+2008-05-12 Stefan Monnier <address@hidden>
+
+ * smerge-mode.el (smerge-apply-resolution-patch): Don't pass nil
+ to `insert'.
+
2008-05-12 Dan Nicolaescu <address@hidden>
* vc.el (vc-annotate-show-diff-revision-at-line): Remove incorrect
@@ -6,8 +11,7 @@
2008-05-12 Teodor Zlatanov <address@hidden>
- * mail/smtpmail.el: Add autoload for
- `auth-source-user-or-password'.
+ * mail/smtpmail.el: Add autoload for `auth-source-user-or-password'.
(smtpmail-try-auth-methods): Use it.
2008-05-12 Stefan Monnier <address@hidden>
@@ -17,8 +21,7 @@
2008-05-11 Carsten Dominik <address@hidden>
- * org/org.el (org-modules): Repair problems with loading
- org-jsinfo.org.
+ * org/org.el (org-modules): Repair problems with loading org-jsinfo.org.
2008-05-11 Stefan Monnier <address@hidden>
@@ -103,8 +106,7 @@
documented in the manual.
* vc-dispatcher.el (vc-dir-update, vc-dir-parent-marked-p)
- (vc-dir-children-marked-p): Remove the vc-dir-insert-directories
- global.
+ (vc-dir-children-marked-p): Remove the vc-dir-insert-directories global.
(vc-dispatcher-selection-set): Allow callers to pass in an
observer flag that says no buffer sync is required.
* vc.el (vc-deduce-fileset, vc-print-log, vc-version-diff):
@@ -116,16 +118,16 @@
2008-05-09 Eric S. Raymond <address@hidden>
- * vc-sccs.el, vc.svn.el, vc-git.el, vc-hg.el, vc-mtn.el: Remove
- stub implementations of, and references to, wash-log.
+ * vc-sccs.el, vc.svn.el, vc-git.el, vc-hg.el, vc-mtn.el:
+ Remove stub implementations of, and references to, wash-log.
* vc-rcs.el (vc-rcs-comment-history):
* vc-cvs.el (vc-cvs-comment-history):
Inline the code that used to be wash-log.
* vc-sccs.el (vc-sccs-checkin, vc-sccs-checkout, vc-sccs-rollback)
- (vc-sccs-revert, vc-sccs-steal-lock, vc-sccs-modify-change-comment,
- vc-sccs-print-log, vc-sccs-diff): Grok directories.
- * vc-rcs.el (vc-sccs-checkin, vc-sccs-checkout,
+ (vc-sccs-revert, vc-sccs-steal-lock, vc-sccs-modify-change-comment)
+ (vc-sccs-print-log, vc-sccs-diff): Grok directories.
+ * vc-rcs.el (vc-sccs-checkin, vc-sccs-checkout)
(vc-rcs-revert, vc-rcs-steal-lock, vc-rcs-modify-change-comment)
(vc-rcs-print-log): Grok directories.
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Eric S. Raymond, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juri Linkov, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Carsten Dominik, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Carsten Dominik, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/05/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/05/12
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/05/12
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Eric S. Raymond, 2008/05/12
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Teodor Zlatanov, 2008/05/12
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2008/05/12
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/05/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/05/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/05/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Chong Yidong, 2008/05/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/05/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Jay Belanger, 2008/05/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Chong Yidong, 2008/05/13