summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
Commit message (Collapse)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-3209/+0
| | | | | | | | | | | | * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.
* * x-dnd.el (x-dnd-maybe-call-test-function):Stefan Monnier2009-11-131-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.el (split-window-vertically): * whitespace.el (whitespace-help-on): * vc-rcs.el (vc-rcs-consult-headers): * userlock.el (ask-user-about-lock-help) (ask-user-about-supersession-help): * type-break.el (type-break-force-mode-line-update): * time-stamp.el (time-stamp-conv-warn): * terminal.el (te-set-output-log, te-more-break, te-filter) (te-sentinel,terminal-emulator): * term.el (make-term, term-exec, term-sentinel, term-read-input-ring) (term-write-input-ring, term-check-source, term-start-output-log): (term-display-buffer-line, term-dynamic-list-completions): (term-ansi-make-term, serial-term): * subr.el (selective-display): * strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer) (strokes-encode-buffer, strokes-xpm-for-compressed-string): * speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info) (speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support) (speedbar-remove-localized-speedbar-support) (speedbar-set-mode-line-format, speedbar-create-tag-hierarchy) (speedbar-update-special-contents, speedbar-buffer-buttons-engine) (speedbar-buffers-line-directory): * simple.el (shell-command-on-region, append-to-buffer) (prepend-to-buffer): * shadowfile.el (shadow-save-todo-file): * scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1) (scroll-bar-maybe-set-window-start): * sb-image.el (speedbar-image-dump): * saveplace.el (save-place-alist-to-file, save-places-to-alist) (load-save-place-alist-from-file): * ps-samp.el (ps-print-message-from-summary): * ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox) (ps-background-image, ps-begin-job, ps-do-despool): * ps-bdf.el (bdf-find-file, bdf-read-font-info): * printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting) (pr-ps-message-from-summary, pr-lpr-message-from-summary): (pr-call-process, pr-file-list, pr-interface-save): * novice.el (disabled-command-function) (enable-command, disable-command): * mouse.el (mouse-buffer-menu-alist): * mouse-copy.el (mouse-kill-preserving-secondary): * macros.el (kbd-macro-query): * ledit.el (ledit-go-to-lisp, ledit-go-to-liszt): * informat.el (batch-info-validate): * ido.el (ido-copy-current-word, ido-initiate-auto-merge): * hippie-exp.el (try-expand-dabbrev-visible): * help-mode.el (help-make-xrefs): * help-fns.el (describe-variable): * generic-x.el (bat-generic-mode-run-as-comint): * finder.el (finder-mouse-select): * find-dired.el (find-dired-sentinel): * filesets.el (filesets-file-close): * files.el (list-directory): * faces.el (list-faces-display, describe-face): * facemenu.el (list-colors-display): * ezimage.el (ezimage-image-association-dump, ezimage-image-dump): * epg.el (epg--process-filter, epg-cancel): * epa.el (epa--marked-keys, epa--select-keys, epa-display-info) (epa--read-signature-type): * emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B) (emerge-file-names): * ehelp.el (electric-helpify): * ediff.el (ediff-regions-wordwise, ediff-regions-linewise): * ediff-vers.el (rcs-ediff-view-revision): * ediff-util.el (ediff-setup): * ediff-mult.el (ediff-append-custom-diff): * ediff-diff.el (ediff-exec-process, ediff-process-sentinel) (ediff-wordify): * echistory.el (Electric-command-history-redo-expression): * dos-w32.el (find-file-not-found-set-buffer-file-coding-system): * disp-table.el (describe-display-table): * dired.el (dired-find-buffer-nocreate): * dired-aux.el (dired-rename-subdir, dired-dwim-target-directory): * dabbrev.el (dabbrev--same-major-mode-p): * chistory.el (list-command-history): * apropos.el (apropos-documentation): * allout.el (allout-obtain-passphrase): (allout-copy-exposed-to-buffer): (allout-verify-passphrase): Use with-current-buffer.
* Use window-full-height-p.Glenn Morris2009-10-061-4/+3
|
* Use `called-interactively-p' instead of `interactive-p'.Juanma Barranquero2009-10-021-1/+1
|
* Use help-print-return-message rather than the now obsolete alias.Glenn Morris2009-08-211-1/+1
|
* Remove ancient version: header.Glenn Morris2009-07-211-33/+22
| | | | | | | | | | (menu-bar-emerge-menu): Remove unused variable. (emerge-version): Make the variable an obsolete alias for the emacs-version variable. Make the function obsolete. (emerge-fast-keymap, emerge-edit-keymap): Make a separate menu for Emerge options, rather than merging in into the main Options menu. (emerge-options-menu): Adjust menu text. Use buttons for skip prefers and auto advance modes. Disable edit/fast items when not relevant.
* * align.el:Lute Kamstra2008-12-031-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
* 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.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-18 21:02:55 +0000