summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
Commit message (Expand)AuthorAge
* * align.el:Lute Kamstra2008-12-03
* Fix up comment convention on the arch-tag lines.Stefan Monnier2008-04-10
* (emerge-setup): Use insert-buffer-substring.Thien-Thi Nguyen2007-10-18
* (emerge-really-quit): Use `mapc' rather than `mapcar'.Juanma Barranquero2007-09-25
* emerge.el: Move the `defvar's to the top level.Juanma Barranquero2005-08-26
* (merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,Juanma Barranquero2005-08-24
* Replace `string-to-int' by `string-to-number'.Juanma Barranquero2005-05-16
* (emerge-restore-buffer-characteristics): Doc fix.John Paul Wallington2004-01-08
* Add arch taglinesMiles Bader2003-09-01
* Don't redo key bindings on loading, put them only in loaddefs.el.Andreas Schwab2003-08-02
* (emerge-show-file-name): Read event irrespective of whether minibufferJohn Paul Wallington2003-03-24
* Trailing whitespace deleted.Juanma Barranquero2003-02-04
* (emerge-setup-fixed-keymaps): Use command remapping instead ofAndreas Schwab2003-01-12
* (emerge-show-file-name): Use frame-height instead of obsoletePavel Janík2001-12-25
* Converted backquote to the new style.Sam Steingold2001-11-27
* Some fixes to follow coding conventions.Pavel Janík2001-07-16
* (emerge-make-temp-file): Make sure file has properGerd Moellmann2000-06-23
* Use make-temp-file.Stefan Monnier1999-10-15
* (emerge-temp-file-prefix): Use temporary-file-directory.Richard M. Stallman1998-05-16
* (emerge-temp-file-prefix): Use system-tmp-directory.Richard M. Stallman1998-05-16
* Customized.Andreas Schwab1998-01-07
* (emerge-files-with-ancestor, emerge-files):Richard M. Stallman1996-07-30
* (emerge-combine-versions-template): Make theRichard M. Stallman1996-02-25
* Comment change.Richard M. Stallman1996-02-24
* (menu-bar-emerge-menu): Delete spaces before `...'.Karl Heuer1996-01-09
* Comment fixes.Karl Heuer1996-01-05
* (emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.Karl Heuer1995-04-25
* (emerge-read-file-name): New arg must-match.Richard M. Stallman1994-12-16
* (emerge-file-names): Set help-mode in *Help* buffer.Karl Heuer1994-11-09
* (emerge-auto-advance): Fix criterion for which message.Richard M. Stallman1994-10-21
* *** empty log message ***Morten Welinder1994-10-19
* (emerge-recenter, emerge-operate-on-windows):Richard M. Stallman1994-09-21
* (emerge-goto-line): Fix return value.Karl Heuer1994-04-16
* (menu-bar-emerge-menu): Improve menu title.Richard M. Stallman1994-04-11
* (emerge-goto-line): New function.Richard M. Stallman1994-03-28
* (emerge-revisions, emerge-revisions-with-ancestor)Richard M. Stallman1994-03-10
* (menu-bar-emerge-menu): Autoload the whole setup.Richard M. Stallman1994-03-10
* (menu-bar-emerge-menu): New map.Richard M. Stallman1994-02-06
* Add defvars for many vars already being used.Richard M. Stallman1994-02-06
* (emerge-find-difference): Add interactive spec.Richard M. Stallman1993-08-11
* (emerge-default-[AB]): Use (zerop (% A B)) instead ofPaul Eggert1993-08-01
* (emerge-make-diff3-list): Pass ancestor second.Richard M. Stallman1993-06-14
* Apply typo patches from Paul Eggert.Jim Blandy1993-06-09
* (emerge-find-difference-diff): Renamed from emerge-find-difference.Richard M. Stallman1993-05-13
* (emerge-setup-fixed-keymaps): Put emerge-abort on C-].Richard M. Stallman1993-05-13
* (emerge-count-matches-string): Renamed from count-matches-string.Richard M. Stallman1993-05-13
* Install DRW's version 5.Richard M. Stallman1993-05-13
* (emerge-with-ancestor): Applied Donald Erway's fix patch, whichEric S. Raymond1993-04-09
* Added or corrected Commentary sectionsEric S. Raymond1993-03-22
* (emerge-show-file-name): Handle any kind of event.Richard M. Stallman1993-03-06
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 07:24:40 +0000