summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
Commit message (Expand)AuthorAgeFilesLines
* emerge.el: Move the `defvar's to the top level.Juanma Barranquero2005-08-261-5/+11
* (merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,Juanma Barranquero2005-08-241-0/+6
* Replace `string-to-int' by `string-to-number'.Juanma Barranquero2005-05-161-10/+10
* (emerge-restore-buffer-characteristics): Doc fix.John Paul Wallington2004-01-081-2/+2
* Add arch taglinesMiles Bader2003-09-011-0/+1
* Don't redo key bindings on loading, put them only in loaddefs.el.Andreas Schwab2003-08-021-24/+16
* (emerge-show-file-name): Read event irrespective of whether minibufferJohn Paul Wallington2003-03-241-10/+13
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-17/+17
* (emerge-setup-fixed-keymaps): Use command remapping instead ofAndreas Schwab2003-01-121-8/+4
* (emerge-show-file-name): Use frame-height instead of obsoletePavel Janík2001-12-251-1/+1
* Converted backquote to the new style.Sam Steingold2001-11-271-122/+122
* Some fixes to follow coding conventions.Pavel Janík2001-07-161-0/+4
* (emerge-make-temp-file): Make sure file has properGerd Moellmann2000-06-231-2/+6
* Use make-temp-file.Stefan Monnier1999-10-151-3/+1
* (emerge-temp-file-prefix): Use temporary-file-directory.Richard M. Stallman1998-05-161-2/+2
* (emerge-temp-file-prefix): Use system-tmp-directory.Richard M. Stallman1998-05-161-10/+1
* Customized.Andreas Schwab1998-01-071-49/+100
* (emerge-files-with-ancestor, emerge-files):Richard M. Stallman1996-07-301-8/+6
* (emerge-combine-versions-template): Make theRichard M. Stallman1996-02-251-1/+1
* Comment change.Richard M. Stallman1996-02-241-1/+1
* (menu-bar-emerge-menu): Delete spaces before `...'.Karl Heuer1996-01-091-7/+7
* Comment fixes.Karl Heuer1996-01-051-2/+2
* (emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.Karl Heuer1995-04-251-10/+5
* (emerge-read-file-name): New arg must-match.Richard M. Stallman1994-12-161-11/+11
* (emerge-file-names): Set help-mode in *Help* buffer.Karl Heuer1994-11-091-1/+7
* (emerge-auto-advance): Fix criterion for which message.Richard M. Stallman1994-10-211-1/+1
* *** empty log message ***Morten Welinder1994-10-191-1/+3
* (emerge-recenter, emerge-operate-on-windows):Richard M. Stallman1994-09-211-4/+4
* (emerge-goto-line): Fix return value.Karl Heuer1994-04-161-17/+7
* (menu-bar-emerge-menu): Improve menu title.Richard M. Stallman1994-04-111-1/+1
* (emerge-goto-line): New function.Richard M. Stallman1994-03-281-5/+17
* (emerge-revisions, emerge-revisions-with-ancestor)Richard M. Stallman1994-03-101-0/+4
* (menu-bar-emerge-menu): Autoload the whole setup.Richard M. Stallman1994-03-101-3/+9
* (menu-bar-emerge-menu): New map.Richard M. Stallman1994-02-061-0/+20
* Add defvars for many vars already being used.Richard M. Stallman1994-02-061-22/+146
* (emerge-find-difference): Add interactive spec.Richard M. Stallman1993-08-111-0/+1
* (emerge-default-[AB]): Use (zerop (% A B)) instead ofPaul Eggert1993-08-011-2/+2
* (emerge-make-diff3-list): Pass ancestor second.Richard M. Stallman1993-06-141-7/+7
* Apply typo patches from Paul Eggert.Jim Blandy1993-06-091-6/+6
* (emerge-find-difference-diff): Renamed from emerge-find-difference.Richard M. Stallman1993-05-131-11/+20
* (emerge-setup-fixed-keymaps): Put emerge-abort on C-].Richard M. Stallman1993-05-131-0/+1
* (emerge-count-matches-string): Renamed from count-matches-string.Richard M. Stallman1993-05-131-356/+364
* Install DRW's version 5.Richard M. Stallman1993-05-131-766/+761
* (emerge-with-ancestor): Applied Donald Erway's fix patch, whichEric S. Raymond1993-04-091-3/+6
* Added or corrected Commentary sectionsEric S. Raymond1993-03-221-114/+119
* (emerge-show-file-name): Handle any kind of event.Richard M. Stallman1993-03-061-2/+2
* JimB's changes since January 18thJim Blandy1993-01-261-1/+1
* * bytecomp.el: Declare unread-command-char an obsolete variable.Jim Blandy1992-11-161-5/+5
* Dox fixes.Christopher Zaborsky1992-10-181-81/+93
* entered into RCSRichard M. Stallman1992-07-291-0/+1