[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: |
Thu, 08 Nov 2007 16:58:10 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 07/11/08 16:58:09
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12170
retrieving revision 1.12171
diff -u -b -r1.12170 -r1.12171
--- ChangeLog 7 Nov 2007 20:41:12 -0000 1.12170
+++ ChangeLog 8 Nov 2007 16:58:07 -0000 1.12171
@@ -1,14 +1,18 @@
+2007-11-08 Stefan Monnier <address@hidden>
+
+ * smerge-mode.el (smerge-refine-subst): Pass "-d" to diff.
+
2007-11-07 Michael Albinus <address@hidden>
- * net/tramp.el (tramp-handle-substitute-in-file-name): Don't
- expand the remote connection identification.
+ * net/tramp.el (tramp-handle-substitute-in-file-name):
+ Don't expand the remote connection identification.
(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
Set also $PS2 and $PS3 when setting $PS1. Check for shell echoing
before calling stty.
* net/tramp-cache.el (tramp-cache-print)
(tramp-dump-connection-properties): Fix docstring.
- (tramp-list-connections): Renamed from
+ (tramp-list-connections): Rename from
`tramp-cache-list-connections'.
* net/tramp-cmds.el (tramp-cleanup-connection): Apply it.
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Carsten Dominik, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Michael Albinus, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Andreas Schwab, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2007/11/06
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Michael Albinus, 2007/11/07
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Vinicius Jose Latorre, 2007/11/08
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Vinicius Jose Latorre, 2007/11/08
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Michael Albinus, 2007/11/08
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2007/11/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Miles Bader, 2007/11/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2007/11/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Vinicius Jose Latorre, 2007/11/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Vinicius Jose Latorre, 2007/11/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/11/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2007/11/09