Package: emacs;
Reported by: Uday S Reddy <u.s.reddy <at> cs.bham.ac.uk>
Date: Fri, 25 Jun 2010 17:46:02 UTC
Severity: normal
Found in version 23.2
Fixed in version 29.1
Done: Lars Ingebrigtsen <larsi <at> gnus.org>
Bug is archived. No further changes may be made.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Uday S Reddy <u.s.reddy <at> cs.bham.ac.uk> To: bug-gnu-emacs <at> gnu.org Cc: U.S.Reddy <at> cs.bham.ac.uk Subject: 23.2; ediff-diff-options being ignored Date: Fri, 25 Jun 2010 16:00:38 +0100
I have ediff-diff-options set to "--text". But, as the backtrace below shows, it seems to be ignored. The problem for me is that, on Windows Cygwin, diff --binary is not working correctly. diff --text works fine, but ediff isn't using the option. Debugger entered--entering a function: * ediff-exec-process("diff" #<buffer *ediff-diff<3>*> synchronize "--binary" "d:/Home/udr/tmp/saved-options2" "d:/Home/udr/tmp/saved-options") byte-code(...) * ediff-make-diff2-buffer(#<buffer *ediff-diff<3>*> "d:/Home/udr/tmp/saved-options2" "d:/Home/udr/tmp/saved-options") ediff-setup-diff-regions("d:/Home/udr/tmp/saved-options2" "d:/Home/udr/tmp/saved-options" nil) ediff-setup(#<buffer saved-options2> "d:/Home/udr/tmp/saved-options2" #<buffer saved-options> "d:/Home/udr/tmp/saved-options" nil nil nil ((ediff-job-name . ediff-files)) nil) ediff-files-internal("d:/Home/udr/tmp/saved-options2" "d:/Home/udr/tmp/saved-options" nil nil ediff-files) ediff-files("d:/Home/udr/tmp/saved-options2" "d:/Home/udr/tmp/saved-options") call-interactively(ediff-files t nil) execute-extended-command(nil) call-interactively(execute-extended-command nil nil) Cheers, Uday Reddy ----- In GNU Emacs 23.2.1 (i386-mingw-nt5.1.2600) of 2010-05-08 on G41R2F1 Windowing system distributor `Microsoft Corp.', version 5.1.2600 configured using `configure --with-gcc (3.4) --no-opt --cflags -Ic:/xpm/include' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: ENU value of $XMODIFIERS: nil locale-coding-system: cp1252 default enable-multibyte-characters: t Major mode: Fundamental Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t which-function-mode: t savehist-mode: t tooltip-mode: t mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t blink-cursor-mode: t auto-encryption-mode: t line-number-mode: t transient-mark-mode: t Recent input: n s <return> SPC <backspace> <backspace> q <switch-frame> <down-mouse-1> <mouse-movement> <mouse-1> M-x l i s t - m a t c h - <backspace> i n g = <backspace> - l i n e s <return> d i f f - o p t i o n s <return> C-x o C-n C-n C-n C-n C-n C-n <return> C-x o C-n C-n C-n <down> <down> <down> <down> <down> <down> <down> <down> <down> <down> <down> <down> <up> <return> C-x o C-x , C-s a c t u a l - d i f f C-s C-s C-s C-s C-s C-r C-r C-s C-s C-s C-s C-s C-s C-s C-a C-x , C-s e x e c - C-r C-a C-x o C-r e x e c C-a <f1> C-x d e d i f f - e x e c - p r o SPC <return> <switch-frame> <down-mouse-1> <mouse-movement> <mouse-1> C-x b <return> M-x e d i f f - f i l e s <return> <up> <return> <up> <up> <return> w M-x l o c a l - s e e t <return> w <backspace> <backspace> <backspace> t <return> w t o g g l e - t r u SPC <return> w c w <help-echo> <help-echo> <down-mouse-1> <mouse-1> <wheel-down> <wheel-down> <wheel-down> <wheel-up> <double-wheel-up> <wheel-up> <double-wheel-up> <triple-wheel-up> <wheel-up> <double-wheel-up> <triple-wheel-up> <help-echo> <help-echo> <help-echo> <help-echo> <help-echo> <help-echo> <help-echo> <help-echo> <help-echo> <down-mouse-1> <mouse-1> C-a C-SPC C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-x C-k C-x , q M-x s u b m i t - e m SPC <backspace> <backspace> <backspace> <backspace> <backspace> <backspace> <backspace> <backspace> <backspace> r e p o r t - e m SPC SPC b u SPC <return> Recent messages: Entering debugger... truncate-lines turned off Continuing. Computing differences between saved-options2 and saved-options ... Entering debugger... truncate-lines turned off byte-code: Beginning of buffer [6 times] Mark set [2 times] Back to top level. Making completion list... Load-path shadows: d:/gnu/vm/trunk/lisp/vm-ps-print hides d:/gnu/emacs-23.2/../site-lisp/vm-ps-print d:/gnu/emacs-23.2/../packages/org-mode/lisp/org hides d:/gnu/emacs-23.2/lisp/org/org d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-xoxo hides d:/gnu/emacs-23.2/lisp/org/org-xoxo d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-wl hides d:/gnu/emacs-23.2/lisp/org/org-wl d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-w3m hides d:/gnu/emacs-23.2/lisp/org/org-w3m d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-vm hides d:/gnu/emacs-23.2/lisp/org/org-vm d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-timer hides d:/gnu/emacs-23.2/lisp/org/org-timer d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-table hides d:/gnu/emacs-23.2/lisp/org/org-table d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-src hides d:/gnu/emacs-23.2/lisp/org/org-src d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-rmail hides d:/gnu/emacs-23.2/lisp/org/org-rmail d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-remember hides d:/gnu/emacs-23.2/lisp/org/org-remember d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-publish hides d:/gnu/emacs-23.2/lisp/org/org-publish d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-protocol hides d:/gnu/emacs-23.2/lisp/org/org-protocol d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-plot hides d:/gnu/emacs-23.2/lisp/org/org-plot d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-mouse hides d:/gnu/emacs-23.2/lisp/org/org-mouse d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-mobile hides d:/gnu/emacs-23.2/lisp/org/org-mobile d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-mhe hides d:/gnu/emacs-23.2/lisp/org/org-mhe d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-mew hides d:/gnu/emacs-23.2/lisp/org/org-mew d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-macs hides d:/gnu/emacs-23.2/lisp/org/org-macs d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-mac-message hides d:/gnu/emacs-23.2/lisp/org/org-mac-message d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-list hides d:/gnu/emacs-23.2/lisp/org/org-list d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-latex hides d:/gnu/emacs-23.2/lisp/org/org-latex d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-jsinfo hides d:/gnu/emacs-23.2/lisp/org/org-jsinfo d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-irc hides d:/gnu/emacs-23.2/lisp/org/org-irc d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-install hides d:/gnu/emacs-23.2/lisp/org/org-install d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-inlinetask hides d:/gnu/emacs-23.2/lisp/org/org-inlinetask d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-info hides d:/gnu/emacs-23.2/lisp/org/org-info d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-indent hides d:/gnu/emacs-23.2/lisp/org/org-indent d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-id hides d:/gnu/emacs-23.2/lisp/org/org-id d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-icalendar hides d:/gnu/emacs-23.2/lisp/org/org-icalendar d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-html hides d:/gnu/emacs-23.2/lisp/org/org-html d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-habit hides d:/gnu/emacs-23.2/lisp/org/org-habit d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-gnus hides d:/gnu/emacs-23.2/lisp/org/org-gnus d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-freemind hides d:/gnu/emacs-23.2/lisp/org/org-freemind d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-footnote hides d:/gnu/emacs-23.2/lisp/org/org-footnote d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-feed hides d:/gnu/emacs-23.2/lisp/org/org-feed d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-faces hides d:/gnu/emacs-23.2/lisp/org/org-faces d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-exp hides d:/gnu/emacs-23.2/lisp/org/org-exp d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-exp-blocks hides d:/gnu/emacs-23.2/lisp/org/org-exp-blocks d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-docbook hides d:/gnu/emacs-23.2/lisp/org/org-docbook d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-datetree hides d:/gnu/emacs-23.2/lisp/org/org-datetree d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-crypt hides d:/gnu/emacs-23.2/lisp/org/org-crypt d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-compat hides d:/gnu/emacs-23.2/lisp/org/org-compat d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-colview hides d:/gnu/emacs-23.2/lisp/org/org-colview d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-clock hides d:/gnu/emacs-23.2/lisp/org/org-clock d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-bibtex hides d:/gnu/emacs-23.2/lisp/org/org-bibtex d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-bbdb hides d:/gnu/emacs-23.2/lisp/org/org-bbdb d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-attach hides d:/gnu/emacs-23.2/lisp/org/org-attach d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-ascii hides d:/gnu/emacs-23.2/lisp/org/org-ascii d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-archive hides d:/gnu/emacs-23.2/lisp/org/org-archive d:/gnu/emacs-23.2/../packages/org-mode/lisp/org-agenda hides d:/gnu/emacs-23.2/lisp/org/org-agenda d:/Home/udr/share/emacs/rnews hides d:/gnu/emacs-23.2/lisp/obsolete/rnews Features: (shadow sort message ecomplete mml mml-sec mm-decode mm-bodies mm-encode mailcap nnheader gmm-utils mailheader canlock hashcash emacsbug find-func vc autoconf autoconf-mode org-wl org-w3m org-vm org-rmail org-mhe org-mew org-irc org-jsinfo org-infojs org-html org-exp org-exp-blocks org-agenda org-info org-gnus org-docview org-bibtex org-bbdb org byte-opt bytecomp byte-compile org-footnote org-src org-list org-faces org-compat org-entities org-macs noutline outline cal-menu calendar cal-loaddefs texinfo mule-util add-log ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff vc-dispatcher smerge-mode diff-mode easy-mmode cus-edit cus-start cus-load pp debug cl-specs edebug w3m-form vm-w3m w3m doc-view image-mode w3m-hist w3m-fb w3m-ems wid-edit w3m-ccl ccl w3m-favicon w3m-image w3m-proc w3m-util bbdb-gui smtpmail vm-pine flyspell ispell newcomment mail-utils vm-digest mailalias vm-reply longlines nroff-mode ansi-color sh-script executable multi-isearch tramp-imap assoc tramp-gw tramp-fish tramp-cache tramp-ftp tramp-cmds tramp auth-source gnus-util netrc shell password-cache format-spec tramp-compat trampver browse-url info vm-delete bbdb-hooks mail-parse rfc2231 rfc2047 rfc2045 qp ietf-drums mm-util time-date mail-prsvr vm-pop tapestry vm-sort vm-thread vm-crypto vm-imap vm-summary-faces vm-virtual vc-bzr sha1 hex-util etags vm-ps-print ps-print ps-def lpr vm-save my-vm vm-rfaddons vm-menu vm-window vm-toolbar vm-folder vm-mime vm-undo vm-mouse vm-page vm-minibuf vm-message vm-misc vm-macro bbdb-vm vm-summary vm-motion vm-autoload bbdb-snarf mail-extr rfc822 bbdb-com mailabbrev vm warnings help-mode easymenu view dired-x dired-aux mydired dired messcompat w3m-load bbdb-autoloads bbdb timezone vm-autoloads vm-vars vm-version org-install ange-ftp tex-site tex-mik telnet comint ring movement natural-space NatSpeak sendmail regexp-opt echistory chistory ehelp electric derived which-func imenu advice help-fns advice-preload edmacro kmacro savehist-20+ cl cl-19 jka-compr tooltip ediff-hook vc-hooks lisp-float-type mwheel dos-w32 disp-table ls-lisp w32-win w32-vars tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mldrag mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button minibuffer faces cus-face files text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process multi-tty emacs) --
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.