index
:
forks/emacs.git
local/emacs-29
local/emacs30
master
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
lisp
/
emerge.el
Commit message (
Expand
)
Author
Age
Files
Lines
*
Some fixes to follow coding conventions.
Pavel JanÃk
2001-07-16
1
-0
/
+4
*
(emerge-make-temp-file): Make sure file has proper
Gerd Moellmann
2000-06-23
1
-2
/
+6
*
Use make-temp-file.
Stefan Monnier
1999-10-15
1
-3
/
+1
*
(emerge-temp-file-prefix): Use temporary-file-directory.
Richard M. Stallman
1998-05-16
1
-2
/
+2
*
(emerge-temp-file-prefix): Use system-tmp-directory.
Richard M. Stallman
1998-05-16
1
-10
/
+1
*
Customized.
Andreas Schwab
1998-01-07
1
-49
/
+100
*
(emerge-files-with-ancestor, emerge-files):
Richard M. Stallman
1996-07-30
1
-8
/
+6
*
(emerge-combine-versions-template): Make the
Richard M. Stallman
1996-02-25
1
-1
/
+1
*
Comment change.
Richard M. Stallman
1996-02-24
1
-1
/
+1
*
(menu-bar-emerge-menu): Delete spaces before `...'.
Karl Heuer
1996-01-09
1
-7
/
+7
*
Comment fixes.
Karl Heuer
1996-01-05
1
-2
/
+2
*
(emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.
Karl Heuer
1995-04-25
1
-10
/
+5
*
(emerge-read-file-name): New arg must-match.
Richard M. Stallman
1994-12-16
1
-11
/
+11
*
(emerge-file-names): Set help-mode in *Help* buffer.
Karl Heuer
1994-11-09
1
-1
/
+7
*
(emerge-auto-advance): Fix criterion for which message.
Richard M. Stallman
1994-10-21
1
-1
/
+1
*
*** empty log message ***
Morten Welinder
1994-10-19
1
-1
/
+3
*
(emerge-recenter, emerge-operate-on-windows):
Richard M. Stallman
1994-09-21
1
-4
/
+4
*
(emerge-goto-line): Fix return value.
Karl Heuer
1994-04-16
1
-17
/
+7
*
(menu-bar-emerge-menu): Improve menu title.
Richard M. Stallman
1994-04-11
1
-1
/
+1
*
(emerge-goto-line): New function.
Richard M. Stallman
1994-03-28
1
-5
/
+17
*
(emerge-revisions, emerge-revisions-with-ancestor)
Richard M. Stallman
1994-03-10
1
-0
/
+4
*
(menu-bar-emerge-menu): Autoload the whole setup.
Richard M. Stallman
1994-03-10
1
-3
/
+9
*
(menu-bar-emerge-menu): New map.
Richard M. Stallman
1994-02-06
1
-0
/
+20
*
Add defvars for many vars already being used.
Richard M. Stallman
1994-02-06
1
-22
/
+146
*
(emerge-find-difference): Add interactive spec.
Richard M. Stallman
1993-08-11
1
-0
/
+1
*
(emerge-default-[AB]): Use (zerop (% A B)) instead of
Paul Eggert
1993-08-01
1
-2
/
+2
*
(emerge-make-diff3-list): Pass ancestor second.
Richard M. Stallman
1993-06-14
1
-7
/
+7
*
Apply typo patches from Paul Eggert.
Jim Blandy
1993-06-09
1
-6
/
+6
*
(emerge-find-difference-diff): Renamed from emerge-find-difference.
Richard M. Stallman
1993-05-13
1
-11
/
+20
*
(emerge-setup-fixed-keymaps): Put emerge-abort on C-].
Richard M. Stallman
1993-05-13
1
-0
/
+1
*
(emerge-count-matches-string): Renamed from count-matches-string.
Richard M. Stallman
1993-05-13
1
-356
/
+364
*
Install DRW's version 5.
Richard M. Stallman
1993-05-13
1
-766
/
+761
*
(emerge-with-ancestor): Applied Donald Erway's fix patch, which
Eric S. Raymond
1993-04-09
1
-3
/
+6
*
Added or corrected Commentary sections
Eric S. Raymond
1993-03-22
1
-114
/
+119
*
(emerge-show-file-name): Handle any kind of event.
Richard M. Stallman
1993-03-06
1
-2
/
+2
*
JimB's changes since January 18th
Jim Blandy
1993-01-26
1
-1
/
+1
*
* bytecomp.el: Declare unread-command-char an obsolete variable.
Jim Blandy
1992-11-16
1
-5
/
+5
*
Dox fixes.
Christopher Zaborsky
1992-10-18
1
-81
/
+93
*
entered into RCS
Richard M. Stallman
1992-07-29
1
-0
/
+1
*
*** empty log message ***
Richard M. Stallman
1992-07-22
1
-19
/
+14
*
*** empty log message ***
Jim Blandy
1992-07-15
1
-2
/
+2
*
*** empty log message ***
Eric S. Raymond
1992-05-30
1
-3
/
+10
*
Initial revision
Jim Blandy
1992-03-16
1
-0
/
+2979