mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Code Issues Releases Activity
70,654 Commits 225 Branches 189 Tags 518 MiB
597086b330
Commit Graph

51 Commits

Author SHA1 Message Date
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Stefan Monnier
0778a62fff (smerge-remove-props): Don't mark the buffer modified. 
(debug-ignored-errors): Add entry from smerge-match-conflict.
 2007-03-08 20:12:55 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Stefan Monnier
cc1eecfd88 Update my email address. 2006-04-30 15:49:08 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Romain Francoise
9700a45fa2 Add 'tools' to file keywords. 2005-10-26 08:38:07 +00:00
Stefan Monnier
91773964a5 (smerge-remove-props): Cause re-highlighting of the whole conflict. 2005-09-23 18:15:20 +00:00
Richard M. Stallman
f57b45cfee (smerge-resolve): Pass args to smerge-remove-props. 2005-09-09 01:16:05 +00:00
Juanma Barranquero
a6022f153a (smerge-refined-change): Add :group. 2005-08-26 09:37:57 +00:00
Stefan Monnier
41796d0900 (smerge-remove-props): Make the args non-optional. 
(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.
 2005-08-25 20:13:38 +00:00
Stefan Monnier
48d59eda34 (smerge-basic-map): Bind smerge-combine-with-next. 
(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.
 2005-08-22 14:38:51 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Stefan Monnier
a34ed813d1 (smerge-ediff): Use insert-buffer-substring. 2005-07-26 16:07:55 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Richard M. Stallman
7f84c46eb8 (smerge-mode): Add duplicate defvar near top. 2005-07-03 16:12:14 +00:00
Juanma Barranquero
376166e6e6 (smerge-ensure-match): Don't use format' on error' arguments. 2005-06-16 14:34:12 +00:00
Miles Bader
e8bfdf824f Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375 
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.
 2005-06-10 08:48:08 +00:00
Dan Nicolaescu
ea81d57ec5 * mh-customize.el (mh-speedbar-selected-folder-face): Special case 
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.
 2005-04-08 14:26:13 +00:00
Lute Kamstra
c06dbb8f15 (smerge-mode): Specify :group. 2005-04-04 09:09:01 +00:00
Juanma Barranquero
3b0af40281 (smerge-diff-switches): Fix typo in docstring. 2004-04-30 21:12:42 +00:00
Stefan Monnier
2a3d70d45d (smerge-match-conflict): Fix last change. 2004-04-15 20:46:54 +00:00
Stefan Monnier
9f0c286d22 (smerge-match-conflict): Try to do something sensible 
for nested conflict markers.
(smerge-find-conflict): Better handle errors in smerge-match-conflict.
 2004-04-15 20:19:11 +00:00
Stefan Monnier
65114860f5 (smerge-popup-context-menu): Use it. 2004-04-14 17:40:57 +00:00
Stefan Monnier
5bd8d87b85 (smerge-mode-menu): Fix activate pred for resolve. 
(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.
 2004-03-23 19:56:42 +00:00
Masatake YAMATO
935ce7caa0 (smerge-popup-context-menu): Put unwind-protect' arround overlay-put' and `popup-menu'. 2004-03-16 16:27:10 +00:00
Masatake YAMATO
11ece56b1a 2004-03-15 Masatake YAMATO <jet@gyve.org> 
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.
 2004-03-15 11:27:47 +00:00
Stefan Monnier
7d85a64e42 (smerge-check-cache, smerge-check): New var and fun. 
(smerge-mode-menu): Use it to deactivate menu entries.
(smerge-keep-current): New fun.
(smerge-keep-current): Use it.
 2004-03-10 23:42:37 +00:00
Dave Love
8f6cea29d7 Previous change was bogus. Something odd in pcl-cvs... 2003-10-06 16:34:59 +00:00
Dave Love
f73c072cbf Comment. 2003-10-06 16:33:13 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Juanma Barranquero
f1180544bb Trailing whitespace deleted. 2003-02-04 12:29:42 +00:00
Stefan Monnier
a48402c999 (smerge-ediff): Autoload. 
(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.
 2002-10-10 17:30:20 +00:00
Stefan Monnier
a1038ca045 (smerge-ediff): Autoload. 2002-10-10 13:01:14 +00:00
Stefan Monnier
15092da1f1 (smerge-ediff): Add name-{mine,other,base} args. 2002-10-04 15:25:22 +00:00
Stefan Monnier
814838dff6 (smerge-diff-buffer-name): Default to *vc-diff*. 
(smerge-combine-with-next): New function.
(smerge-diff): Don't output `wrote /tmp/foo' messages.
Insert message if no diffs were found.
 2002-09-03 01:20:20 +00:00
Stefan Monnier
1a4914f340 Use find-file-hook instead of find-file-hooks. 2002-08-15 00:48:20 +00:00
Stefan Monnier
e29f823e0d (smerge-match-conflict): Fix typo. 
(smerge-diff): Be careful to read match-data early enough.
 2001-11-15 01:25:35 +00:00
Gerd Moellmann
0304b9c787 (smerge-mode): Check if `font-lock-mode' is bound 
before accessing it.
 2001-07-31 08:28:43 +00:00
Stefan Monnier
0f49941f67 (smerge-mode): Force font-lock-multiline to t. 2001-05-10 20:23:48 +00:00
Stefan Monnier
f5cd98c0d4 (font-lock-keywords, font-lock-mode): Don't bind, just declare. 2001-03-07 00:16:29 +00:00
Stefan Monnier
f0c1adabcb (smerge-font-lock-keywords): Relax submatch 1. 2001-01-25 15:37:21 +00:00
Stefan Monnier
83f40583a4 *** empty log message *** 2000-12-23 20:54:14 +00:00
Stefan Monnier
6eabfb2600 (smerge-basic-map): Use =' rather than d'. 
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.
 2000-12-22 23:19:47 +00:00
Stefan Monnier
0e86b6b04b (smerge-basic-map): Use =' rather than d'. 
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
 2000-12-22 22:59:17 +00:00
Stefan Monnier
d73aed133b (smerge-diff): Setup the buffer's default-directory 
and add filename to the names so that diff-mode can jump to source.
 2000-10-06 16:07:31 +00:00
Miles Bader
b25f5aecdf (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face): 
Add dark-background variants.
 2000-10-05 06:05:51 +00:00
Stefan Monnier
394bd1cae1 (smerge-mode-menu): Doc fix. 2000-08-16 19:51:55 +00:00
Dave Love
43e764c952 (smerge-mode-menu): Fill it out. 2000-07-21 13:53:20 +00:00
Dave Love
a7b779771d (smerge-diff-switches): Don't use list* in defcustom. 2000-05-25 18:08:26 +00:00
Stefan Monnier
f97e9a8a43 (smerge-auto-leave): New function and variable. 
(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.
 2000-03-22 00:54:55 +00:00