summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
Commit message (Collapse)AuthorAgeFilesLines
* (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
|
* (smerge-ediff): Add name-{mine,other,base} args.Stefan Monnier2002-10-041-6/+11
|
* (smerge-diff-buffer-name): Default to *vc-diff*.Stefan Monnier2002-09-031-21/+50
| | | | | | (smerge-combine-with-next): New function. (smerge-diff): Don't output `wrote /tmp/foo' messages. Insert message if no diffs were found.
* Use find-file-hook instead of find-file-hooks.Stefan Monnier2002-08-151-2/+2
|
* (smerge-match-conflict): Fix typo.Stefan Monnier2001-11-151-5/+11
| | | | (smerge-diff): Be careful to read match-data early enough.
* (smerge-mode): Check if `font-lock-mode' is boundGerd Moellmann2001-07-311-3/+3
| | | | before accessing it.
* (smerge-mode): Force font-lock-multiline to t.Stefan Monnier2001-05-101-1/+2
|
* (font-lock-keywords, font-lock-mode): Don't bind, just declare.Stefan Monnier2001-03-071-3/+3
|
* (smerge-font-lock-keywords): Relax submatch 1.Stefan Monnier2001-01-251-2/+2
|
* *** empty log message ***Stefan Monnier2000-12-231-39/+1
|
* (smerge-basic-map): Use `=' rather than `d'.Stefan Monnier2000-12-221-2/+8
| | | | | | Use minibuffer menu prompt for the `=' prefix. (smerge-command-prefix): Change default to C-^. (smerge-mode): Don't assume font-lock doesn't move point.
* (smerge-basic-map): Use `=' rather than `d'.Stefan Monnier2000-12-221-7/+13
| | | | | Use minibuffer menu prompt for the `=' prefix. (smerge-command-prefix): Change default to C-^.
* (smerge-diff): Setup the buffer's default-directoryStefan Monnier2000-10-061-3/+12
| | | | and add filename to the names so that diff-mode can jump to source.
* (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):Miles Bader2000-10-051-6/+21
| | | | Add dark-background variants.
* (smerge-mode-menu): Doc fix.Stefan Monnier2000-08-161-4/+6
|
* (smerge-mode-menu): Fill it out.Dave Love2000-07-211-2/+22
|
* (smerge-diff-switches): Don't use list* in defcustom.Dave Love2000-05-251-3/+11
|
* (smerge-auto-leave): New function and variable.Stefan Monnier2000-03-221-41/+40
| | | | | | | | (smerge-basic-map): Rename from smerge-basic-keymap. Change the bindings for smerge-diff-*. (smerge-*-map): Use easy-mmode-defmap. (smerge-(next|prev)): Use easy-mmode-define-navigation. (smerge-keep-*): Use smerge-auto-leave.
* New file. Provides a simple minor-mode for files containingStefan Monnier1999-12-091-0/+453
diff3-style conflict markers, such as generated by RCS
View Lorry Controller Status