summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
Commit message (Collapse)AuthorAgeFilesLines
* (smerge-start-session): Don't call smerge-next ifStefan Monnier2008-05-051-1/+2
| | | | looking at conflict marker.
* (smerge-apply-resolution-patch): Fix typo.Stefan Monnier2008-04-111-21/+27
| | | | | (smerge-resolve): Merge the "2-way refinement" case with one half of the "mere whitespace" resolution.
* (smerge-apply-resolution-patch): New fun.Stefan Monnier2008-03-311-27/+151
| | | | (smerge-resolve): Add various resolution heuristics.
* (smerge-refine): Allow highlighting other subparts in 3-way conflicts.Stefan Monnier2008-03-311-9/+30
|
* (smerge-auto-combine-max-separation): New var.Stefan Monnier2008-02-131-0/+21
| | | | (smerge-auto-combine): New fun.
* * smerge-mode.el (smerge-start-session): Rename from smerge-auto.Dan Nicolaescu2008-01-161-1/+1
| | | | | | | | * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Rename callers. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): Undo previous change.
* (smerge-refine): Also work on "same change conflicts".Stefan Monnier2008-01-151-4/+32
| | | | (smerge-makeup-conflict): New command.
* * smerge-mode.el (smerge-auto): New function.Dan Nicolaescu2008-01-141-0/+8
| | | | | | | | * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode. (top-level): Add a Todo list.
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
| |
* | * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):Dan Nicolaescu2007-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * play/yow.el (doctor-ret-or-read): * vc-hooks.el (vc-dired-resynch-file): * vc-hg.el (log-view-get-marked): * smerge-mode.el (ediff-cleanup-mess): * pcvs.el (vc-editable-p, vc-checkout): * pcomplete.el (comint-bol): * informat.el (texinfo-format-refill): * ido.el (tramp-tramp-file-p): * ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier) (ibuffer-generate-filter-groups) (ibuffer-format-filter-group-data): * add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as functions. * ido.el (ido-file-internal): Move with-no-warnings to include the ffap-string-at-point call. * pcomplete.el (pcomplete-executables): Move defsubst before first use. * vc-hg.el (vc-hg-revision-table): Fix last change.
* | (smerge-refine-subst): Pass "-d" to diff.Stefan Monnier2007-11-081-3/+8
| |
* | * term/x-win.el (x-gtk-stock-map, icon-map-list)Dan Nicolaescu2007-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (x-gtk-map-stock): Delete duplicated definitions from merge. * progmodes/octave-mod.el: Require octave-inf at compile time * progmodes/compile.el (compilation-skip-to-next-location) (compilation-skip-threshold, compilation-skip-visited): Move definitions earlier. * play/zone.el (zone-fall-through-ws): * play/landmark.el (lm-move-down, lm-move-up): * play/handwrite.el (handwrite): * mail/mspools.el (mspools-visit-spool): * wdired.el (wdired-next-line, wdired-previous-line): * tar-mode.el (tar-subfile-save-buffer): * scroll-lock.el (scroll-lock-next-line) (scroll-lock-previous-line): * image-dired.el (image-dired-next-line) (image-dired-previous-line): * ediff-help.el (ediff-help-message-line-length): Use forward-line. * smerge-mode.el (smerge-auto-refine): * diff-mode.el (diff-auto-refine): Add :group. * play/yow.el: Require doctor at compile time. * vmsproc.el: Provide vmsproc. (command-send-input): Use forward-line. * vms-patch.el: Require ps-print and vmsproc at compile time. * vc-mtn.el (log-view-message-re, log-view-file-re) (log-view-font-lock-keywords): Pacify byte-compiler. * vc-hg.el: Require log-view at compile time.
* | (smerge-auto-refine): New var.Stefan Monnier2007-10-201-1/+13
| | | | | | | | | | (smerge-next, smerge-prev): Use it. (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
* | Add word-granularity refinement.Stefan Monnier2007-10-191-38/+135
| | | | | | | | | | | | | | | | (smerge-refine-forward-function, smerge-refine-ignore-whitespace) (smerge-refine-weight-hack): New vars. (smerge-refine-forward): New fun. (smerge-refine-chopup-region, smerge-refine-highlight-change): Use them. (smerge-refine-subst): Use them as well. Preserve point.
* | (smerge-refine-chopup-region): Add `preproc' argument.Stefan Monnier2007-10-091-25/+41
|/ | | | | | (smerge-refine-highlight-change): Add `props' argument. (smerge-refine-subst): New function holding most of smerge-refine. (smerge-refine): Use it.
* (smerge-resolve): New arg `safe'.Stefan Monnier2007-08-161-5/+46
| | | | | | | (smerge-resolve-all, smerge-batch-resolve): New function. (smerge-refine): Make sure `diff' returns the expected result. (smerge-parsep-re): New const. (smerge-mode): Use it to adjust paragraph-separate.
* Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
|
* (smerge-remove-props): Don't mark the buffer modified.Stefan Monnier2007-03-081-1/+5
| | | | (debug-ignored-errors): Add entry from smerge-match-conflict.
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
|
* Update my email address.Stefan Monnier2006-04-301-1/+1
|
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
|
* Add 'tools' to file keywords.Romain Francoise2005-10-261-1/+1
|
* (smerge-remove-props): Cause re-highlighting of the whole conflict.Stefan Monnier2005-09-231-1/+11
|
* (smerge-resolve): Pass args to smerge-remove-props.Richard M. Stallman2005-09-091-1/+1
|
* (smerge-refined-change): Add :group.Juanma Barranquero2005-08-261-1/+2
|
* (smerge-remove-props): Make the args non-optional.Stefan Monnier2005-08-251-6/+86
| | | | | | | | | | | (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.
* (smerge-basic-map): Bind smerge-combine-with-next.Stefan Monnier2005-08-221-28/+84
| | | | | | | | | | | | | | | | | (smerge-auto-leave): Make undo re-enable the mode. (debug-ignored-errors): Add the user-error of impossible resolution. (smerge-resolve): Move things around a bit, in preparation for later. (smerge-diff): Don't fail if the buffer has no associated file. (ediff-ancestor-buffer, ediff-quit-hook): Quieten byte-compiler. (smerge-conflict-overlay): New function. (smerge-match-conflict): Don't add text properties here. (smerge-find-conflict): Instead, add an overlay here. Also check for the case where we're inside a conflict already, so as to obviate the need for font-lock-multiline, which is unbearably slow with large conflicts and ciomplex font-lock patterns. (smerge-remove-props): Remove overlay rather than text-properties. (smerge-mode): Don't set font-lock-multiline. Remove overlays when turned off.
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+2
|
* (smerge-ediff): Use insert-buffer-substring.Stefan Monnier2005-07-261-1/+1
|
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
|
* (smerge-mode): Add duplicate defvar near top.Richard M. Stallman2005-07-031-0/+3
|
* (smerge-ensure-match): Don't use `format' on `error' arguments.Juanma Barranquero2005-06-161-1/+1
|
* Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375Miles Bader2005-06-101-8/+16
| | | | | | | | | | | | | | Remove "-face" suffix from smerge faces 2005-06-10 Miles Bader <miles@gnu.org> * lisp/smerge-mode.el (smerge-mine, smerge-other, smerge-base) (smerge-markers): Remove "-face" suffix from face names. (smerge-mine-face, smerge-other-face, smerge-base-face) (smerge-markers-face): New backward-compatibility aliases for renamed faces. (smerge-mine-face, smerge-other-face, smerge-base-face) (smerge-markers-face): Use renamed smerge faces.
* * mh-customize.el (mh-speedbar-selected-folder-face): Special caseDan Nicolaescu2005-04-081-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | high number of colors displays. * textmodes/table.el (table-cell-face): Add special case for displays supporting a high number of colors. * progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face) (vhdl-font-lock-reserved-words-face) (vhdl-speedbar-architecture-face) (vhdl-speedbar-instantiation-face) (vhdl-speedbar-architecture-selected-face) (vhdl-speedbar-instantiation-selected-face): Likewise. * progmodes/sh-script.el (sh-heredoc-face): Likewise. * progmodes/idlw-help.el (idlwave-help-link-face): Likewise. * progmodes/ebrowse.el (ebrowse-tree-mark-face) (ebrowse-root-class-face, ebrowse-member-attribute-face) (ebrowse-progress-face): Likewise. * progmodes/compile.el (compilation-info-face): Likewise. * progmodes/cc-fonts.el (c-invalid-face): Likewise. * emacs-lisp/re-builder.el (reb-match-3): Likewise. * calendar/calendar.el (diary-face): Likewise. * woman.el (woman-italic-face, woman-bold-face) (woman-unknown-face): Likewise. * wid-edit.el (widget-button-pressed-face): Likewise. * whitespace.el (whitespace-highlight-face): Likewise. * smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise. * pcvs-info.el (cvs-marked-face): Likewise. * info.el (info-xref): Likewise. * ido.el (ido-subdir-face, ido-indicator-face): Likewise. * hilit-chg.el (highlight-changes-face) (highlight-changes-delete-face): Likewise. * hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b) (hi-red-b): Likewise. * generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise. * font-lock.el (font-lock-keyword-face) (font-lock-function-name-face, font-lock-warning-face): Likewise. * cus-edit.el (custom-invalid-face, custom-modified-face) (custom-set-face, custom-changed-face, custom-variable-tag-face) (custom-group-tag-face-1, custom-group-tag-face): Likewise. * comint.el (comint-highlight-prompt): Likewise.
* (smerge-mode): Specify :group.Lute Kamstra2005-04-041-2/+2
|
* (smerge-diff-switches): Fix typo in docstring.Juanma Barranquero2004-04-301-3/+3
|
* (smerge-match-conflict): Fix last change.Stefan Monnier2004-04-151-1/+1
|
* (smerge-match-conflict): Try to do something sensibleStefan Monnier2004-04-151-4/+13
| | | | | for nested conflict markers. (smerge-find-conflict): Better handle errors in smerge-match-conflict.
* (smerge-popup-context-menu): Use it.Stefan Monnier2004-04-141-2/+2
|
* (smerge-mode-menu): Fix activate pred for resolve.Stefan Monnier2004-03-231-47/+72
| | | | | | | | | | | (smerge-context-menu-map): Remove unused var. (smerge-keep-all): Preserve markers. (smerge-keep-n): New fun. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-ediff): Use it. (smerge-kill-current): Use it. Make it work on some 3-part conflicts. (smerge-popup-context-menu): Also use context-menu on 3-part conflicts. (smerge-resolve): Resolve trivial 3-part conflicts.
* (smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and ↵Masatake YAMATO2004-03-161-7/+9
| | | | `popup-menu'.
* 2004-03-15 Masatake YAMATO <jet@gyve.org>Masatake YAMATO2004-03-151-16/+94
| | | | | | | | | | | | | | | | | | Added context menu support in smerge mode. Most of the part is written by Stefan Monnier. * smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New keyman and menu. (smerge-text-properties): New function. (smerge-remove-props): New function. (smerge-popup-context-menu): New function. (smerge-resolve): Call `smerge-remove-props'. (smerge-keep-base, smerge-keep-other, smerge-keep-mine): Ditto. (smerge-keep-current): Ditto. (smerge-kill-current): New function. (smerge-match-conflict): Detect the file as `a same-diff conflict' if the filename is "ANCESTOR". Put text properties.
* (smerge-check-cache, smerge-check): New var and fun.Stefan Monnier2004-03-101-15/+47
| | | | | | (smerge-mode-menu): Use it to deactivate menu entries. (smerge-keep-current): New fun. (smerge-keep-current): Use it.
* Previous change was bogus. Something odd in pcl-cvs...Dave Love2003-10-061-4/+3
|
* Comment.Dave Love2003-10-061-3/+4
|
* Add arch taglinesMiles Bader2003-09-011-1/+3
|
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-7/+7
|
* (smerge-ediff): Autoload.Stefan Monnier2002-10-101-2/+18
| | | | | | | (smerge-match-conflict): Don't assume as much about smerge-begin-re. (smerge-resolve-function): New var. (smerge-resolve): New command. (smerge-basic-map): Bind it.
* (smerge-ediff): Autoload.Stefan Monnier2002-10-101-1/+2
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-14 10:17:46 +0000