summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
Commit message (Collapse)AuthorAgeFilesLines
* Fix up comment convention on the arch-tag lines.Stefan Monnier2008-04-101-1/+1
|
* (emerge-setup): Use insert-buffer-substring.Thien-Thi Nguyen2007-10-181-3/+3
| | | | (emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise.
* (emerge-really-quit): Use `mapc' rather than `mapcar'.Juanma Barranquero2007-09-251-7/+7
|
* 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
| | | | diff-vector, valid-diff): Defvar at compile time to silence the byte-compiler.
* 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
| | | | window is resized. Clear minibuffer when done.
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-17/+17
|
* (emerge-setup-fixed-keymaps): Use command remapping instead ofAndreas Schwab2003-01-121-8/+4
| | | | substitute-key-definition.
* (emerge-show-file-name): Use frame-height instead of obsoletePavel Janík2001-12-251-1/+1
| | | | screen-height.
* 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
| | | | permissions from birth.
* 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
| | | | Use add-hook to add to QUIT-HOOKS.
* (emerge-combine-versions-template): Make theRichard M. Stallman1996-02-251-1/+1
| | | | generated comments on the #else and #endif follow the GNU standards.
* 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-auto-advance, emerge-skip-prefers): Use force-mode-line-update. (emerge-refresh-mode-line): Use force-mode-line-update.
* (emerge-read-file-name): New arg must-match.Richard M. Stallman1994-12-161-11/+11
| | | | (emerge-files, emerge-files-with-ancestor): Pass new arg.
* (emerge-file-names): Set help-mode in *Help* buffer.Karl Heuer1994-11-091-1/+7
| | | | [commented out] (describe-mode): Likewise.
* (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
| | | | Use `visible' when calling get-buffer-window.
* (emerge-goto-line): Fix return value.Karl Heuer1994-04-161-17/+7
| | | | (emerge-convert-diffs-to-markers): Fix line number calculations.
* (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-convert-diffs-to-markers): Use it.
* (emerge-revisions, emerge-revisions-with-ancestor)Richard M. Stallman1994-03-101-0/+4
| | | | (emerge-merge-directories): Add autoloads.
* (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-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.
* (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
| | | | (= (* (/ A B) B) A).
* (emerge-make-diff3-list): Pass ancestor second.Richard M. Stallman1993-06-141-7/+7
| | | | | (emerge-extract-diffs3): Replace group-1 with group-2. (emerge-handle-local-variables): Pass no arg to hack-local-variables.
* 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-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.
* (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
| | | | | | | | | | | | | | | | | (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.
* 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
| | | | | | | 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.
* 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-15 18:16:11 +0000