From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Reiner Steib <reiner.steib@gmx.de>
Cc: 4451@emacsbugs.donarmstrong.com
Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin
Date: Thu, 17 Sep 2009 12:35:37 -0400 [thread overview]
Message-ID: <jwvtyz1ttvw.fsf-monnier+emacsbugreports@gnu.org> (raw)
In-Reply-To: <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> (Reiner Steib's message of "Thu, 17 Sep 2009 16:26:12 +0200")
I think the best solution is to change vc-coding-system-for-diff so that
when it takes the coding system from (with-current-buffer buf
buffer-file-coding-system), it ignores the EOL part of that
coding system.
Does the patch below help?
Stefan
=== modified file 'lisp/vc.el'
--- lisp/vc.el 2009-09-14 15:39:41 +0000
+++ lisp/vc.el 2009-09-17 16:35:00 +0000
@@ -1470,7 +1470,11 @@
;; use the buffer's coding system
(let ((buf (find-buffer-visiting file)))
(when buf (with-current-buffer buf
- buffer-file-coding-system)))
+ (if buffer-file-coding-system
+ ;; Don't inherit the EOL part of the coding-system,
+ ;; because some diff tools may choose to use
+ ;; another one.
+ (coding-system-base buffer-file-coding-system)))))
;; otherwise, try to find one based on the file name
(car (find-operation-coding-system 'insert-file-contents file))
;; and a final fallback
next prev parent reply other threads:[~2009-09-17 16:35 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 18:08 bug#4451: 23.1; EOL problems with vc-diff and cygwin Reiner Steib
2009-09-16 20:56 ` Eli Zaretskii
2009-09-17 14:26 ` Reiner Steib
2009-09-17 16:35 ` Stefan Monnier [this message]
2009-09-17 17:22 ` Eli Zaretskii
2009-09-17 20:59 ` Stefan Monnier
2009-09-18 11:29 ` Reiner Steib
2009-09-24 17:00 ` Reiner Steib
2009-09-24 22:07 ` Stefan Monnier
2009-09-25 19:11 ` Eli Zaretskii
2009-09-26 8:27 ` Reiner Steib
2009-09-26 9:20 ` Eli Zaretskii
2009-09-27 0:36 ` Stefan Monnier
2009-09-27 7:38 ` Eli Zaretskii
2009-09-27 19:03 ` Stefan Monnier
2009-09-27 20:35 ` Reiner Steib
2009-09-28 1:08 ` Stefan Monnier
2009-10-05 16:07 ` Reiner Steib
2009-10-05 18:45 ` Stefan Monnier
2009-10-05 20:58 ` Eli Zaretskii
2010-07-15 7:22 ` Reiner Steib
2010-07-15 8:33 ` Eli Zaretskii
2010-07-16 6:51 ` Reiner Steib
2010-07-16 8:05 ` Andreas Schwab
2010-07-16 10:18 ` Eli Zaretskii
2010-07-19 7:23 ` Reiner Steib
2009-09-17 17:18 ` Eli Zaretskii
2009-09-18 11:31 ` Reiner Steib
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=jwvtyz1ttvw.fsf-monnier+emacsbugreports@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=4451@emacsbugs.donarmstrong.com \
--cc=reiner.steib@gmx.de \
/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.