| Fri, 16 Apr 2004 12:51:06 +0000 |
Kenichi Handa |
Sync to HEAD
|
| Mon, 16 Jan 2006 00:03:54 +0000 |
Henrik Enberg |
sync with trunk
|
| Mon, 08 Sep 2003 11:56:09 +0000 |
Kenichi Handa |
New directory
|
| Thu, 18 Oct 2007 18:24:45 +0000 |
Thien-Thi Nguyen |
(emerge-setup): Use insert-buffer-substring.
|
| Tue, 25 Sep 2007 11:02:09 +0000 |
Juanma Barranquero |
(emerge-really-quit): Use `mapc' rather than `mapcar'.
|
| Fri, 26 Aug 2005 10:46:08 +0000 |
Juanma Barranquero |
emerge.el: Move the `defvar's to the top level.
|
| Wed, 24 Aug 2005 11:35:31 +0000 |
Juanma Barranquero |
(merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,
|
| Mon, 16 May 2005 11:33:47 +0000 |
Juanma Barranquero |
Replace `string-to-int' by `string-to-number'.
|
| Thu, 08 Jan 2004 05:42:13 +0000 |
John Paul Wallington |
(emerge-restore-buffer-characteristics): Doc fix.
|
| Mon, 01 Sep 2003 15:45:59 +0000 |
Miles Bader |
Add arch taglines
|
| Sat, 02 Aug 2003 22:05:00 +0000 |
Andreas Schwab |
Don't redo key bindings on loading, put them only in loaddefs.el.
|
| Mon, 24 Mar 2003 08:52:20 +0000 |
John Paul Wallington |
(emerge-show-file-name): Read event irrespective of whether minibuffer
|
| Tue, 04 Feb 2003 11:26:42 +0000 |
Juanma Barranquero |
Trailing whitespace deleted.
|
| Sun, 12 Jan 2003 20:46:08 +0000 |
Andreas Schwab |
(emerge-setup-fixed-keymaps): Use command remapping instead of
|
| Tue, 25 Dec 2001 10:59:23 +0000 |
Pavel Jank |
(emerge-show-file-name): Use frame-height instead of obsolete
|
| Tue, 27 Nov 2001 15:52:52 +0000 |
Sam Steingold |
Converted backquote to the new style.
|
| Mon, 16 Jul 2001 12:23:00 +0000 |
Pavel Jank |
Some fixes to follow coding conventions.
|
| Fri, 23 Jun 2000 07:05:34 +0000 |
Gerd Moellmann |
(emerge-make-temp-file): Make sure file has proper
|
| Fri, 15 Oct 1999 16:03:59 +0000 |
Stefan Monnier |
Use make-temp-file.
|
| Sat, 16 May 1998 17:48:49 +0000 |
Richard M. Stallman |
(emerge-temp-file-prefix): Use temporary-file-directory.
|
| Sat, 16 May 1998 03:43:28 +0000 |
Richard M. Stallman |
(emerge-temp-file-prefix): Use system-tmp-directory.
|
| Wed, 07 Jan 1998 10:31:09 +0000 |
Andreas Schwab |
Customized.
|
| Tue, 30 Jul 1996 21:55:13 +0000 |
Richard M. Stallman |
(emerge-files-with-ancestor, emerge-files):
|
| Sun, 25 Feb 1996 22:53:18 +0000 |
Richard M. Stallman |
(emerge-combine-versions-template): Make the
|
| Sat, 24 Feb 1996 04:43:05 +0000 |
Richard M. Stallman |
Comment change.
|
| Tue, 09 Jan 1996 23:16:41 +0000 |
Karl Heuer |
(menu-bar-emerge-menu): Delete spaces before `...'.
|
| Fri, 05 Jan 1996 22:21:28 +0000 |
Karl Heuer |
Comment fixes.
|
| Tue, 25 Apr 1995 22:23:02 +0000 |
Karl Heuer |
(emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.
|
| Fri, 16 Dec 1994 14:03:04 +0000 |
Richard M. Stallman |
(emerge-read-file-name): New arg must-match.
|
| Wed, 09 Nov 1994 05:52:20 +0000 |
Karl Heuer |
(emerge-file-names): Set help-mode in *Help* buffer.
|
