2005-08-26 |
Juanma Barranquero |
emerge.el: Move the `defvar's to the top level.
|
2005-08-24 |
Juanma Barranquero |
(merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,
|
2005-05-16 |
Juanma Barranquero |
Replace `string-to-int' by `string-to-number'.
|
2004-01-08 |
John Paul Wallington |
(emerge-restore-buffer-characteristics): Doc fix.
|
2003-09-01 |
Miles Bader |
Add arch taglines
|
2003-08-02 |
Andreas Schwab |
Don't redo key bindings on loading, put them only in loaddefs.el.
|
2003-03-24 |
John Paul Wallington |
(emerge-show-file-name): Read event irrespective of whether minibuffer
|
2003-02-04 |
Juanma Barranquero |
Trailing whitespace deleted.
|
2003-01-12 |
Andreas Schwab |
(emerge-setup-fixed-keymaps): Use command remapping instead of
|
2001-12-25 |
Pavel Janík |
(emerge-show-file-name): Use frame-height instead of obsolete
|
2001-11-27 |
Sam Steingold |
Converted backquote to the new style.
|
2001-07-16 |
Pavel Janík |
Some fixes to follow coding conventions.
|
2000-06-23 |
Gerd Moellmann |
(emerge-make-temp-file): Make sure file has proper
|
1999-10-15 |
Stefan Monnier |
Use make-temp-file.
|
1998-05-16 |
Richard M. Stallman |
(emerge-temp-file-prefix): Use temporary-file-directory.
|
1998-05-16 |
Richard M. Stallman |
(emerge-temp-file-prefix): Use system-tmp-directory.
|
1998-01-07 |
Andreas Schwab |
Customized.
|
1996-07-30 |
Richard M. Stallman |
(emerge-files-with-ancestor, emerge-files):
|
1996-02-25 |
Richard M. Stallman |
(emerge-combine-versions-template): Make the
|
1996-02-24 |
Richard M. Stallman |
Comment change.
|
1996-01-09 |
Karl Heuer |
(menu-bar-emerge-menu): Delete spaces before `...'.
|
1996-01-05 |
Karl Heuer |
Comment fixes.
|
1995-04-25 |
Karl Heuer |
(emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.
|
1994-12-16 |
Richard M. Stallman |
(emerge-read-file-name): New arg must-match.
|
1994-11-09 |
Karl Heuer |
(emerge-file-names): Set help-mode in *Help* buffer.
|
1994-10-21 |
Richard M. Stallman |
(emerge-auto-advance): Fix criterion for which message.
|
1994-10-19 |
Morten Welinder |
*** empty log message ***
|
1994-09-21 |
Richard M. Stallman |
(emerge-recenter, emerge-operate-on-windows):
|
1994-04-16 |
Karl Heuer |
(emerge-goto-line): Fix return value.
|
1994-04-11 |
Richard M. Stallman |
(menu-bar-emerge-menu): Improve menu title.
|
1994-03-28 |
Richard M. Stallman |
(emerge-goto-line): New function.
|
1994-03-10 |
Richard M. Stallman |
(emerge-revisions, emerge-revisions-with-ancestor)
|
1994-03-10 |
Richard M. Stallman |
(menu-bar-emerge-menu): Autoload the whole setup.
|
1994-02-06 |
Richard M. Stallman |
(menu-bar-emerge-menu): New map.
|
1994-02-06 |
Richard M. Stallman |
Add defvars for many vars already being used.
|
1993-08-11 |
Richard M. Stallman |
(emerge-find-difference): Add interactive spec.
|
1993-08-01 |
Paul Eggert |
(emerge-default-[AB]): Use (zerop (% A B)) instead of
|
1993-06-14 |
Richard M. Stallman |
(emerge-make-diff3-list): Pass ancestor second.
|
1993-06-09 |
Jim Blandy |
Apply typo patches from Paul Eggert.
|
1993-05-13 |
Richard M. Stallman |
(emerge-find-difference-diff): Renamed from emerge-find-difference.
|
1993-05-13 |
Richard M. Stallman |
(emerge-setup-fixed-keymaps): Put emerge-abort on C-].
|
1993-05-13 |
Richard M. Stallman |
(emerge-count-matches-string): Renamed from count-matches-string.
|
1993-05-13 |
Richard M. Stallman |
Install DRW's version 5.
|
1993-04-09 |
Eric S. Raymond |
(emerge-with-ancestor): Applied Donald Erway's fix patch, which
|
1993-03-22 |
Eric S. Raymond |
Added or corrected Commentary sections
|
1993-03-06 |
Richard M. Stallman |
(emerge-show-file-name): Handle any kind of event.
|
1993-01-26 |
Jim Blandy |
JimB's changes since January 18th
|
1992-11-16 |
Jim Blandy |
* bytecomp.el: Declare unread-command-char an obsolete variable.
|
1992-10-18 |
Christopher Zaborsky |
Dox fixes.
|
1992-07-29 |
Richard M. Stallman |
entered into RCS
|
1992-07-22 |
Richard M. Stallman |
*** empty log message ***
|
1992-07-15 |
Jim Blandy |
*** empty log message ***
|
1992-05-30 |
Eric S. Raymond |
*** empty log message ***
|
1992-03-16 |
Jim Blandy |
Initial revision
|