From: Juri Linkov <juri@jurta.org>
To: emacs-devel@gnu.org
Subject: Re: Ediff-patch-file with wrong default buffer
Date: Tue, 02 Feb 2010 02:33:17 +0200 [thread overview]
Message-ID: <87k4uwa3ka.fsf@mail.jurta.org> (raw)
In-Reply-To: <87aaxmkput.fsf@mail.jurta.org> (Juri Linkov's message of "Mon, 14 Dec 2009 08:54:18 +0200")
> The GNU Diff manual defines the unified format which looks like this:
>
> --- FROM-FILE FROM-FILE-MODIFICATION-TIME
> +++ TO-FILE TO-FILE-MODIFICATION-TIME
Yet another problem with bzr and diff formats:
For Lisp files it's useful to set vc-bzr-diff-switches to "-F ^("
or diff --diff-options '-F ^(' aka `--show-function-line'
to show a function/variable name that precedes the hunk
(like "@@ (defvar ispell-message-text-end" in the patch below).
But in this case, with (add-hook 'message-send-hook 'ispell-message)
`ispell-message' checks the spelling of the whole patch that is annoying.
`ispell-message-text-end' defines the limit of spell-checking
for unidiff/context diff formats. But it is too strict.
This patch removes the final newline to allow more text after @@:
=== modified file 'lisp/textmodes/ispell.el'
--- lisp/textmodes/ispell.el 2010-01-14 18:59:31 +0000
+++ lisp/textmodes/ispell.el 2010-02-02 00:32:03 +0000
@@ -3459,7 +3459,7 @@ (defvar ispell-message-text-end
;; Matches context difference listing
"\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*"
;; Matches unidiff difference listing
- "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@\n"
+ "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@"
;; Matches reporter.el bug report
"^current state:\n==============\n"
;; Matches commonly used "cut" boundaries
--
Juri Linkov
http://www.jurta.org/emacs/
next prev parent reply other threads:[~2010-02-02 0:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-05 23:48 Fix info display of images David Kastrup
2009-12-07 17:55 ` Juri Linkov
2009-12-07 20:28 ` David Kastrup
2009-12-13 11:09 ` David Kastrup
2009-12-13 18:31 ` Juri Linkov
2009-12-14 4:16 ` Chong Yidong
2009-12-14 5:14 ` Ediff-patch-file with wrong default buffer (was: Fix info display of images) Juri Linkov
2009-12-14 5:43 ` Michael Kifer
2009-12-14 5:47 ` Ediff-patch-file with wrong default buffer Juri Linkov
2009-12-14 6:15 ` Michael Kifer
2009-12-14 6:54 ` Juri Linkov
2010-02-02 0:31 ` Juri Linkov
2010-02-02 2:34 ` Stefan Monnier
2010-02-02 22:38 ` Juri Linkov
2010-02-02 0:33 ` Juri Linkov [this message]
2009-12-14 9:35 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k4uwa3ka.fsf@mail.jurta.org \
--to=juri@jurta.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.