mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity
92,596 Commits 225 Branches 189 Tags 527 MiB
aaa448c984
Commit Graph

80 Commits

Author SHA1 Message Date
Juanma Barranquero
b4dc7d9888 Fix typos in comments. 2009-10-04 02:11:57 +00:00
Stefan Monnier
755e021055 (smerge-remove-props, smerge-refine): 
Use with-silent-modifications (bug#4342).
 2009-09-08 19:47:07 +00:00
Glenn Morris
c4f6e489aa Mark face aliases with "-face" suffix as obsolete. 2009-09-01 07:24:13 +00:00
Thien-Thi Nguyen
1b7c198ad1 (smerge-start-session): Add interactive spec. 2009-02-02 13:01:32 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Stefan Monnier
a8028e7bcf Require diff-mode at run-time as well. 2008-10-28 20:43:44 +00:00
Thien-Thi Nguyen
7381be9dcb Make auto-refining a minor mode, and diff- and smerge- use it. 
* diff-mode.el (diff-auto-refine): Delete defcustom.
(diff-auto-refine-mode): New func/var via define-minor-mode.
Update var ref to use diff-auto-refine-mode.
* smerge-mode.el (diff-mode): Require when compiling.
(smerge-auto-refine): Delete defcustom.
Update smerge-auto-refine ref to use diff-auto-refine-mode.
 2008-07-21 14:20:24 +00:00
Stefan Monnier
d5c1493791 (smerge-apply-resolution-patch): Don't pass nil to `insert'. 2008-05-12 18:21:24 +00:00
Reiner Steib
e462b5b8a3 (smerge-start-session): Revert unintended change in 2008-05-10T13:06:33Z!Reiner.Steib@gmx.de. 2008-05-11 20:26:00 +00:00
Glenn Morris
869522fb01 Re-fill copyright years. 
Re-fix permissions notice.
 2008-05-11 19:00:41 +00:00
Reiner Steib
b3fccc2715 (smerge-command-prefix): Fix custom type. 2008-05-10 13:09:04 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Stefan Monnier
8653eee82e (smerge-start-session): Don't call smerge-next if 
looking at conflict marker.
 2008-05-05 06:16:20 +00:00
Stefan Monnier
0e05d8fc47 (smerge-apply-resolution-patch): Fix typo. 
(smerge-resolve): Merge the "2-way refinement" case with one half of
the "mere whitespace" resolution.
 2008-04-11 01:10:43 +00:00
Stefan Monnier
56d707f1c3 (smerge-apply-resolution-patch): New fun. 
(smerge-resolve): Add various resolution heuristics.
 2008-03-31 02:57:39 +00:00
Stefan Monnier
2fa42bb70b (smerge-refine): Allow highlighting other subparts in 3-way conflicts. 2008-03-31 01:49:57 +00:00
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