Commit graph

115 commits

Author SHA1 Message Date
Glenn Morris
f9274544eb (diff-find-file-name): Only accept regular files, to rule out
/dev/null, directories, etc.
2007-08-27 07:11:57 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Stefan Monnier
dfbd373dfb (diff-unified->context, diff-reverse-direction, diff-fixup-modifs):
Typo in docstring.
2007-08-06 20:08:55 +00:00
Stefan Monnier
4c969f97e3 (diff-font-lock-keywords): Fix up false positives.
(diff-beginning-of-file): Adjust to the fact that diff-file-header-re
may match up to 4 lines.
(diff-beginning-of-file-and-junk): Rewrite.
2007-08-03 22:06:36 +00:00
Dan Nicolaescu
eff23ff376 * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Remove.
(vc-git-revision-completion-table): Enable.

* vc-hooks.el (vc-handled-backends): Add GIT and HG.

* vc.el (vc-directory-exclusion-list): Add .git and .hg.

* vc-hg.el (vc-hg-revision-completion-table): Re-enable.

* diff-mode.el (diff-mode-menu): New entries.

* diff-mode.el (diff-beginning-of-file-and-junk): New function.
(diff-file-kill): Use it.
(diff-beginning-of-hunk): Add arg `try-harder' using it.
(diff-restrict-view, diff-find-source-location, diff-refine-hunk):
Use it so they find the hunk even when we're in the file header.

* vc.el: Add new VC operation `revision-completion-table'.
(vc-default-revision-completion-table): New function.
(vc-version-diff, vc-version-other-window): Use it to provide
completion of revision names if the backend provides it.

* vc-arch.el (vc-arch--version-completion-table)
(vc-arch-revision-completion-table): New functions to provide
completion of revision names.

* vc-cvs.el: Require CL.
(vc-cvs-revision-table, vc-cvs-revision-completion-table):
New functions to provide completion of revision names.

* eval.c (init_eval_once): Bump max_lisp_eval_depth to 400.

* vc2-xtra.texi (Customizing VC): Add GIT and HG.
2007-07-30 00:19:06 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Stefan Monnier
f151b310f6 (diff-refine-ignore-spaces-hunk): Rename from
diff-refine-hunk.  Adjust users.
(diff-unified-hunk-p, diff-splittable-p): New functions.
(diff-mode-menu): Use it to disable Split when it doesn't work.
2007-07-22 22:02:49 +00:00
Stefan Monnier
8f2d38de67 *** empty log message *** 2007-07-22 21:59:55 +00:00
Stefan Monnier
3dc04e8360 (diff-unified->context): Use the new `apply' undo entry kind
if applicable, so as to save undo-log space.
2007-07-22 21:38:28 +00:00
Stefan Monnier
e4456fdfc8 (diff-find-file-name): Add arg `batch'. 2007-07-22 21:28:14 +00:00
Stefan Monnier
fd69179929 (diff-beginning-of-file-and-junk): New function.
(diff-file-kill): Use it.
(diff-beginning-of-hunk): Add arg `try-harder' using it.
(diff-restrict-view, diff-find-source-location, diff-refine-hunk):
Use it so they find the hunk even when we're in the file header.
2007-07-22 21:26:34 +00:00
Stefan Monnier
d8e4eadf9b (diff-font-lock-keywords): Fix M. Kifer's last change differently. 2007-06-22 21:18:31 +00:00
Stefan Monnier
97311ec3a4 (diff-font-lock-keywords): Fix M. Kifer's last change. 2007-06-13 21:11:42 +00:00
Michael Kifer
ac64a7284e 2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-prefix-arg-com,viper-prefix-arg-value): display
	error messages
	(viper-prev-destructive-command,viper-insert-prev-from-insertion-ring):
	get rid of cl.el dependencies.

	* viper-init.el (viper-suppress-input-method-change-message): new
	variable.
	(viper-activate-input-method-action,viper-inactivate-input-method-action):
	use viper-suppress-input-method-change-message.

	* viper-kem.el (viper-vi-basic-map): disable the bindings for C-s, C-r.

	* viper-util.el (viper-set-cursor-color-according-to-state): use
	viper-replace-overlay-cursor-color instead of
	viper-replace-overlay-cursor-color.
	(viper-sit-for-short): use sit-for with 3 arguments.

	* viper.el (viper-insert-state-mode-list): add gud-mode.
	(viper-major-mode-modifier-list): add viper-comint-mode-modifier-map to
	gud-mode.

	* ediff-mult.el
	(ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message):
	new variables.
	(ediff-meta-buffer-message): variable deleted.
	(ediff-verbose-help-enabled): new variable.
	(ediff-toggle-verbose-help-meta-buffer): new function.
	(ediff-redraw-directory-group-buffer): made aware of short/verbose
	message options

	* ediff-ptch.el (ediff-context-diff-label-regexp): better regexp.
	(ediff-fixup-patch-map): improved heuristic.
2007-06-12 19:20:25 +00:00
Stefan Monnier
44a07c5a3c (diff-apply-hunk, diff-test-hunk): Don't do by default
the exact opposite of diff-goto-source.
2007-05-08 16:07:32 +00:00
Chong Yidong
6035b97e5c (diff-mode): Revert 2007-03-04 change. 2007-04-06 18:45:34 +00:00
Andreas Schwab
593b4fa884 (diff-apply-hunk): Use proper format string for
error.
2007-03-11 10:45:00 +00:00
Richard M. Stallman
b64d66b546 (diff-mode): Doc fix. 2007-03-05 03:14:25 +00:00
Stefan Monnier
2365ab4a00 (diff-sanity-check-hunk): Fix last fix. 2007-02-08 16:34:28 +00:00
Stefan Monnier
a3ee90d98c *** empty log message *** 2007-02-07 17:08:36 +00:00
Stefan Monnier
3a349573d8 (diff-sanity-check-context-hunk-half, diff-sanity-check-hunk): New functions.
(diff-find-source-location): Use'em to check the hunks are well-formed.
2007-01-11 16:52:59 +00:00
Stefan Monnier
fe39af99e5 (diff-mode-map): Add a binding for unified->context. 2006-11-27 20:59:54 +00:00
Stefan Monnier
cb9a30c8e1 (diff-apply-hunk-to-backup-file): New var.
(diff-apply-hunk): Use it to ask for confirmation.
2006-09-11 18:11:19 +00:00
Stefan Monnier
e78cf8e555 (diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
(diff-unified->context, diff-context->unified)
(diff-reverse-direction): Make sure the end marker stays at the end.
(diff-mode): Add the keymap table at the end of docstring.
Use lexical-let rather than constructing a closure manually.
2006-07-02 14:29:28 +00:00
Chong Yidong
dd24cb375f * diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
(diff-refine-hunk): Set inhibit-read-only to t.
2006-06-06 14:17:31 +00:00
Chong Yidong
53dd481c3f * diff-mode.el (diff-mode): Set buffer-read-only to t when
diff-default-read-only is non-nill.

	* diff.el (diff-sentinel, diff): Set inhibit-read-only to t when
	modifying the *Diff* buffer.
	(diff-process-filter): New filter function for diff process that
	sets inhibit-read-only to t when modifying the *Diff* buffer.
2006-06-06 14:06:13 +00:00
Juri Linkov
a70b0ff8f2 (diff-context->unified): Use region-beginning' and region-end'
instead of `mark' and `point'.
(diff-unified->context, diff-reverse-direction, diff-fixup-modifs):
Operate on region in Transient Mark mode when the mark is active.
Use `region-beginning' and `region-end' instead of `mark' and `point'.
(diff-hunk-text, diff-goto-source): Doc fix.
2006-05-09 23:06:14 +00:00
Richard M. Stallman
28408bfd27 (diff-mode-shared-map): Don't bind M-W, M-U, M-C,
M-r, M-R, M-A, M-SPC or M-DEL.
(diff-mode-map): diff-refine-hunk now on C-c C-w
(diff-mode-map): Bind C-c C-e, C-c C-n, C-c C-r, C-c C-u.
2006-05-02 01:39:40 +00:00
Stefan Monnier
cc1eecfd88 Update my email address. 2006-04-30 15:49:08 +00:00
Nick Roberts
ea5d66db38 (diff-function): Make it inherit from diff-header instead of diff-context. 2006-03-21 10:15:39 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Thien-Thi Nguyen
72147c533b (diff-mode): Doc fix. 2005-10-16 21:49:00 +00:00
Juanma Barranquero
6e0f362cb0 (add-log-buffer-file-name-function): Add defvar. 2005-08-31 13:47:51 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Juri Linkov
050dcc13ec (diff-font-lock-keywords): Simplify comments fontifying rule. 2005-07-19 14:42:40 +00:00
Juri Linkov
f3abba999d (diff-file-header): Change foreground color from
yellow to green on light backgrounds.
(diff-context): Inherit from `shadow' only for color/grayscale
with more than 88 colors.
(diff-indicator-removed, diff-indicator-added)
(diff-indicator-changed): New faces.
(diff-font-lock-keywords): Use new faces.  Regroup rules.
Add "^---$" for `normal' diff format.  Fontify `#' lines with
font-lock-comment-delimiter-face and font-lock-comment-face.
Add `#' to ^[^...] in the rule for `diff-context-face'.
2005-07-19 11:28:35 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Juanma Barranquero
bdad2e310e Fix brainos. 2005-07-04 03:11:31 +00:00
Juanma Barranquero
aa753196b9 (diff-mode): Finish `defgroup' description with period.
(diff-context->unified, diff-reverse-direction, diff-unified->context):
"?\ " -> "?\s".
2005-07-04 01:55:56 +00:00
Juanma Barranquero
3b696504cd (diff-mode): Fix typo in docstring. 2005-06-14 14:34:40 +00:00
Miles Bader
221711eb23 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Remove "-face" suffix from diff-mode faces

2005-06-10  Miles Bader  <miles@gnu.org>

   * lisp/diff-mode.el (diff-header, diff-file-header, diff-index)
   (diff-hunk-header, diff-removed, diff-added, diff-changed)
   (diff-function, diff-context, diff-nonexistent):  Remove "-face"
   suffix from face names.
   (diff-header-face, diff-file-header-face, diff-index-face)
   (diff-hunk-header-face, diff-removed-face, diff-added-face)
   (diff-changed-face, diff-function-face, diff-context-face)
   (diff-nonexistent-face):  New backward-compatibility aliases for
   renamed faces.
   (diff-header-face, diff-file-header-face)
   (diff-index, diff-index-face, diff-hunk-header)
   (diff-hunk-header-face, diff-removed, diff-removed-face)
   (diff-added, diff-added-face, diff-changed-face, diff-function)
   (diff-function-face, diff-context-face, diff-nonexistent)
   (diff-nonexistent-face): Use renamed diff-mode faces.
2005-06-10 07:43:31 +00:00
Juri Linkov
c4cf171043 * diff-mode.el (diff-context-face): Inherit from `shadow' face. 2005-06-06 12:22:00 +00:00
Lute Kamstra
d676819ef5 (diff-header-face, diff-file-header-face)
(diff-index-face, diff-hunk-header-face, diff-removed-face)
(diff-added-face, diff-changed-face, diff-function-face)
(diff-context-face, diff-nonexistent-face): Put them in the
diff-mode customization group.
2005-05-20 13:35:11 +00:00
Juanma Barranquero
f530778210 Specify missing group (and type, if simple) in defcustom. 2005-05-19 19:06:19 +00:00
Lute Kamstra
cfc802279a (diff-minor-mode): Specify :group. 2005-04-04 08:54:58 +00:00
Stefan Monnier
4f8150654e (diff-current-defun): Fix 2004-06-13's change. 2004-10-10 04:08:43 +00:00
Stefan Monnier
bd9d7d76f0 (diff-file-header-re): Tighten up regexp a tiny bit.
(diff-fixup-modifs): Catch unified-diff file-headers.
2004-09-29 17:42:50 +00:00
Juri Linkov
677c03828d (diff-mode-map): Rename next-error-follow-mode' to next-error-follow-minor-mode'. 2004-09-08 20:20:05 +00:00
Eli Zaretskii
b711788a4a (diff-mode-map): Bind toggle-next-error-follow-mode. 2004-09-04 12:46:17 +00:00