Mercurial > emacs

log lisp/emerge.el @ 105917:510f457168de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -60 tip
age author description
Tue, 06 Oct 2009 02:42:29 +0000 Glenn Morris Use window-full-height-p.
Fri, 02 Oct 2009 03:48:36 +0000 Juanma Barranquero Use `called-interactively-p' instead of `interactive-p'.
Fri, 21 Aug 2009 07:24:26 +0000 Glenn Morris Use help-print-return-message rather than the now obsolete alias.
Tue, 21 Jul 2009 04:41:29 +0000 Glenn Morris Remove ancient version: header.
Wed, 03 Dec 2008 05:48:14 +0000 Lute Kamstra * align.el:
Thu, 10 Apr 2008 14:10:46 +0000 Stefan Monnier Fix up comment convention on the arch-tag lines.
Fri, 19 Oct 2007 00:00:21 +0000 Miles Bader Merge from emacs--devo--0
Thu, 11 Oct 2007 16:14:00 +0000 Miles Bader Merge from emacs--devo--0
Tue, 06 Sep 2005 00:25:20 +0000 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79
Fri, 26 Aug 2005 09:51:52 +0000 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Fri, 20 May 2005 04:22:05 +0000 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
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.
Fri, 21 Oct 1994 18:43:22 +0000 Richard M. Stallman (emerge-auto-advance): Fix criterion for which message.
Wed, 19 Oct 1994 07:47:54 +0000 Morten Welinder *** empty log message ***
Wed, 21 Sep 1994 18:42:05 +0000 Richard M. Stallman (emerge-recenter, emerge-operate-on-windows):
Sat, 16 Apr 1994 02:39:42 +0000 Karl Heuer (emerge-goto-line): Fix return value.
Mon, 11 Apr 1994 22:25:42 +0000 Richard M. Stallman (menu-bar-emerge-menu): Improve menu title.
Mon, 28 Mar 1994 18:48:16 +0000 Richard M. Stallman (emerge-goto-line): New function.
Thu, 10 Mar 1994 07:27:32 +0000 Richard M. Stallman (emerge-revisions, emerge-revisions-with-ancestor)
Thu, 10 Mar 1994 04:23:52 +0000 Richard M. Stallman (menu-bar-emerge-menu): Autoload the whole setup.
Sun, 06 Feb 1994 02:33:28 +0000 Richard M. Stallman (menu-bar-emerge-menu): New map.
Sun, 06 Feb 1994 02:07:44 +0000 Richard M. Stallman Add defvars for many vars already being used.
Wed, 11 Aug 1993 18:21:49 +0000 Richard M. Stallman (emerge-find-difference): Add interactive spec.
Sun, 01 Aug 1993 20:48:43 +0000 Paul Eggert (emerge-default-[AB]): Use (zerop (% A B)) instead of
Mon, 14 Jun 1993 21:44:34 +0000 Richard M. Stallman (emerge-make-diff3-list): Pass ancestor second.
Wed, 09 Jun 1993 11:59:12 +0000 Jim Blandy Apply typo patches from Paul Eggert.
Thu, 13 May 1993 20:06:18 +0000 Richard M. Stallman (emerge-find-difference-diff): Renamed from emerge-find-difference.
Thu, 13 May 1993 19:33:20 +0000 Richard M. Stallman (emerge-setup-fixed-keymaps): Put emerge-abort on C-].
Thu, 13 May 1993 19:25:37 +0000 Richard M. Stallman (emerge-count-matches-string): Renamed from count-matches-string.
Thu, 13 May 1993 19:24:38 +0000 Richard M. Stallman Install DRW's version 5.
Fri, 09 Apr 1993 23:17:05 +0000 Eric S. Raymond (emerge-with-ancestor): Applied Donald Erway's fix patch, which
less more | (0) -60 tip