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