mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-14 09:39:42 +00:00
Code Issues Releases Activity
81,314 Commits 225 Branches 189 Tags 528 MiB
071e627782
Commit Graph

64 Commits

Author SHA1 Message Date
Stefan Monnier
02dfeba8a4 (smerge-auto-combine-max-separation): New var. 
(smerge-auto-combine): New fun.
 2008-02-13 15:10:57 +00:00
Dan Nicolaescu
28e4e2b434 * smerge-mode.el (smerge-start-session): Rename from smerge-auto. 
* 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.
 2008-01-16 06:22:59 +00:00
Stefan Monnier
30e68410fe (smerge-refine): Also work on "same change conflicts". 
(smerge-makeup-conflict): New command.
 2008-01-15 21:40:09 +00:00
Dan Nicolaescu
ba463d9eca * smerge-mode.el (smerge-auto): New function. 
* 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.
 2008-01-14 07:38:05 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
 2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Dan Nicolaescu
004a00f4ae * progmodes/octave-mod.el (inferior-octave-send-list-and-digest): 
* 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.
 2007-11-19 08:50:04 +00:00
Stefan Monnier
f56f00fa57 (smerge-refine-subst): Pass "-d" to diff. 2007-11-08 16:58:07 +00:00
Dan Nicolaescu
975460179e * term/x-win.el (x-gtk-stock-map, icon-map-list) 
(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.
 2007-10-20 06:30:18 +00:00
Stefan Monnier
2daf4bc667 (smerge-auto-refine): New var. 
(smerge-next, smerge-prev): Use it.
(smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
 2007-10-20 01:52:22 +00:00
Stefan Monnier
cd62539fc7 Add word-granularity refinement. 
(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.
 2007-10-19 15:59:13 +00:00
Stefan Monnier
9f2e22a06d (smerge-refine-chopup-region): Add `preproc' argument. 
(smerge-refine-highlight-change): Add `props' argument.
(smerge-refine-subst): New function holding most of smerge-refine.
(smerge-refine): Use it.
 2007-10-09 03:38:57 +00:00
Stefan Monnier
de68951156 (smerge-resolve): New arg `safe'. 
(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.
 2007-08-16 20:04:36 +00:00
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