mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-17 10:06:13 +00:00
Code Issues Releases Activity
65,757 Commits 225 Branches 189 Tags 522 MiB
eebb17af77
Commit Graph

54 Commits

Author SHA1 Message Date
Juanma Barranquero
3945a3a386 emerge.el: Move the `defvar's to the top level. 2005-08-26 10:46:08 +00:00
Juanma Barranquero
bbf40036a9 (merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff, 
diff-vector, valid-diff): Defvar at compile time to silence the byte-compiler.
 2005-08-24 11:36:27 +00:00
Juanma Barranquero
027a4b6b3f Replace string-to-int' by string-to-number'. 2005-05-16 11:34:49 +00:00
John Paul Wallington
c9ec040a0d (emerge-restore-buffer-characteristics): Doc fix. 2004-01-08 05:43:22 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Andreas Schwab
a1ff29b98a Don't redo key bindings on loading, put them only in loaddefs.el. 2003-08-02 22:06:12 +00:00
John Paul Wallington
784fda4fef (emerge-show-file-name): Read event irrespective of whether minibuffer 
window is resized.  Clear minibuffer when done.
 2003-03-24 08:53:46 +00:00
Juanma Barranquero
71296446d3 Trailing whitespace deleted. 2003-02-04 11:26:42 +00:00
Andreas Schwab
96473b342d (emerge-setup-fixed-keymaps): Use command remapping instead of 
substitute-key-definition.
 2003-01-12 20:46:08 +00:00
Pavel Janík
19d62fda54 (emerge-show-file-name): Use frame-height instead of obsolete 
screen-height.
 2001-12-25 11:01:47 +00:00
Sam Steingold
8a9463543d Converted backquote to the new style. 2001-11-27 15:52:52 +00:00
Pavel Janík
e8af40eed4 Some fixes to follow coding conventions. 2001-07-16 12:23:00 +00:00
Gerd Moellmann
78c56e7062 (emerge-make-temp-file): Make sure file has proper 
permissions from birth.
 2000-06-23 07:06:02 +00:00
Stefan Monnier
767d12f23e Use make-temp-file. 1999-10-15 16:03:59 +00:00
Richard M. Stallman
e4a6b88e82 (emerge-temp-file-prefix): Use temporary-file-directory. 1998-05-16 17:48:49 +00:00
Richard M. Stallman
e4244d3124 (emerge-temp-file-prefix): Use system-tmp-directory. 1998-05-16 03:43:28 +00:00
Andreas Schwab
33933d45be Customized. 1998-01-07 10:31:09 +00:00
Richard M. Stallman
43d3039dff (emerge-files-with-ancestor, emerge-files): 
Use add-hook to add to QUIT-HOOKS.
 1996-07-30 21:55:13 +00:00
Richard M. Stallman
504621b983 (emerge-combine-versions-template): Make the 
generated comments on the #else and #endif follow the GNU standards.
 1996-02-25 22:53:18 +00:00
Richard M. Stallman
c0932fbc8b Comment change. 1996-02-24 04:43:05 +00:00
Karl Heuer
a731bd48ea (menu-bar-emerge-menu): Delete spaces before `...'. 1996-01-09 23:16:41 +00:00
Karl Heuer
a7acbbe4d4 Comment fixes. 1996-01-05 22:21:28 +00:00
Karl Heuer
ec165e569d (emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update. 
(emerge-auto-advance, emerge-skip-prefers): Use force-mode-line-update.
(emerge-refresh-mode-line): Use force-mode-line-update.
 1995-04-25 22:23:02 +00:00
Richard M. Stallman
90371ec97b (emerge-read-file-name): New arg must-match. 
(emerge-files, emerge-files-with-ancestor): Pass new arg.
 1994-12-16 14:03:04 +00:00
Karl Heuer
62f72ce03a (emerge-file-names): Set help-mode in *Help* buffer. 
[commented out] (describe-mode): Likewise.
 1994-11-09 05:52:20 +00:00
Richard M. Stallman
c880b9d57d (emerge-auto-advance): Fix criterion for which message. 1994-10-21 18:43:22 +00:00
Morten Welinder
5d7d1333ac *** empty log message *** 1994-10-19 07:47:54 +00:00
Richard M. Stallman
f405e88797 (emerge-recenter, emerge-operate-on-windows): 
Use `visible' when calling get-buffer-window.
 1994-09-21 18:42:05 +00:00
Karl Heuer
d902167477 (emerge-goto-line): Fix return value. 
(emerge-convert-diffs-to-markers): Fix line number calculations.
 1994-04-16 02:39:42 +00:00
Richard M. Stallman
1c5aa5b292 (menu-bar-emerge-menu): Improve menu title. 1994-04-11 22:25:42 +00:00
Richard M. Stallman
4d4cd289b4 (emerge-goto-line): New function. 
(emerge-convert-diffs-to-markers): Use it.
 1994-03-28 18:48:16 +00:00
Richard M. Stallman
9343c8eea7 (emerge-revisions, emerge-revisions-with-ancestor) 
(emerge-merge-directories): Add autoloads.
 1994-03-10 07:27:32 +00:00
Richard M. Stallman
09113ea2f1 (menu-bar-emerge-menu): Autoload the whole setup. 1994-03-10 04:23:52 +00:00
Richard M. Stallman
125ed9df69 (menu-bar-emerge-menu): New map. 1994-02-06 02:33:28 +00:00
Richard M. Stallman
ff5f6ddda1 Add defvars for many vars already being used. 
(emerge-options-menu, emerge-merge-menu, emerge-move-menu): New vars.
(emerge-setup-fixed-keymaps): Set up emerge-move-menu,
emerge-merge-menu and emerge-options-menu.  Put them into
emerge-fast-keymap.
(emerge-set-keys): Put them into the emerge-edit-keymap.
(emerge-minor-modes-list): Add defvar.
(emerge-before-flag, emerge-after-flag): Move defvars up.
(emerge-files-remote, emerge-files-with-ancestor-remote):
(emerge-remote-exit): Var exit-func renamed to emerge-exit-func.
 1994-02-06 02:07:44 +00:00
Richard M. Stallman
8bfce8a770 (emerge-find-difference): Add interactive spec. 1993-08-11 18:21:49 +00:00
Paul Eggert
e00fcc05ec (emerge-default-[AB]): Use (zerop (% A B)) instead of 
(= (* (/ A B) B) A).
 1993-08-01 20:48:43 +00:00
Richard M. Stallman
4a6e3980e2 (emerge-make-diff3-list): Pass ancestor second. 
(emerge-extract-diffs3): Replace group-1 with group-2.
(emerge-handle-local-variables): Pass no arg to hack-local-variables.
 1993-06-14 21:44:34 +00:00
Jim Blandy
eb8c3be94e Apply typo patches from Paul Eggert. 1993-06-09 11:59:12 +00:00
Richard M. Stallman
661d3230fb (emerge-find-difference-diff): Renamed from emerge-find-difference. 
(emerge-find-difference): New command.  Now on `.'.
(emerge-diff-ok-lines-regexp): Renamed from emerge-diff-ok-lines.
(emerge-diff3-ok-lines-regexp): Renamed from emerge-diff3-ok-lines.
 1993-05-13 20:06:18 +00:00
Richard M. Stallman
adca3f58ff (emerge-setup-fixed-keymaps): Put emerge-abort on C-]. 1993-05-13 19:33:20 +00:00
Richard M. Stallman
737e38923a (emerge-count-matches-string): Renamed from count-matches-string. 
(emerge-command-prefix): Now C-c C-c.
emerge-shadow-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-recursively-substitute-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-unselect-hook): Renamed from emerge-unselect-hooks.
(emerge-files-internal): Use file-local-copy to handle remote files.
(emerge-files-with-ancestor-internal): Likewise.
(emerge-remote-file-p): Deleted.
(emerge-abort): New command.
(describe-mode): Deleted.
(emerge-hash-string-into-string): Renamed from hash-string-into-string.
(emerge-unslashify-name): Renamed from unslashify-name.
(emerge-write-and-delete): Don't write-file if file-out is nil.
 1993-05-13 19:25:37 +00:00
Richard M. Stallman
151e4b9ca8 Install DRW's version 5. 1993-05-13 19:24:38 +00:00
Eric S. Raymond
f3613f5bb5 (emerge-with-ancestor): Applied Donald Erway's fix patch, which 
included the following explanatory comment: "D.Erway - This used to
just do emerge-get-diff3-group on 2, then on 3. This was incorrect,
since the file 3 info for a diff can preceed the file 2 info for that
same diff. So we save and restore point to overcome this.
 1993-04-09 23:17:05 +00:00
Eric S. Raymond
e41b2db1da Added or corrected Commentary sections 1993-03-22 03:27:18 +00:00
Richard M. Stallman
bfd72d065f (emerge-show-file-name): Handle any kind of event. 1993-03-06 06:10:05 +00:00
Jim Blandy
dbc4e1c129 JimB's changes since January 18th 1993-01-26 01:58:16 +00:00
Jim Blandy
4b43edddc0 * bytecomp.el: Declare unread-command-char an obsolete variable. 
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
	vip-prefix-arg-com): Use unread-command-event instead of
	unread-command-char; respect its new semantics.
	* emerge.el (emerge-show-file-name): Same.
 1992-11-16 01:33:17 +00:00
Christopher Zaborsky
a2a05344be Dox fixes. 1992-10-18 19:03:45 +00:00
Richard M. Stallman
ee3b8d4df3 entered into RCS 1992-07-29 05:48:40 +00:00