bug#2869: 23.0.91; ediff-revision via TRAMP broken

[David Abrahams <dave@boostpro.com>]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=us-ascii, Size: 6478 bytes --]


Please write in English if possible, because the Emacs maintainers
usually do not have translators to read other languages for them.

Your bug report will be posted to the emacs-pretest-bug@gnu.org mailing list.

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

On a Mac, open an svn-controlled file via TRAMP to a Linux machine.
`M-x ediff-revision <RET> <RET> <RET>'

This was the backtrace:

Debugger entered--Lisp error: (wrong-type-argument integerp nil)
  signal(wrong-type-argument (integerp nil))
  byte-code("Â\b!ˆÃ	@	A\"‡" [tmpfile err delete-file signal] 3)
  tramp-handle-file-local-copy("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~")
  apply(tramp-handle-file-local-copy "/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~")
  tramp-sh-file-name-handler(file-local-copy "/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~")
  apply(tramp-sh-file-name-handler file-local-copy "/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~")
  tramp-file-name-handler(file-local-copy "/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~")
  file-local-copy("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~")
  tramp-handle-insert-file-contents("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~" t nil nil nil)
  apply(tramp-handle-insert-file-contents ("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~" t nil nil nil))
  tramp-sh-file-name-handler(insert-file-contents "/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~" t nil nil nil)
  apply(tramp-sh-file-name-handler insert-file-contents ("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~" t nil nil nil))
  tramp-file-name-handler(insert-file-contents "/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~" t nil nil nil)
  insert-file-contents("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~" t)
  byte-code("Â\x18Ã	Â\"ˆ)‡" [inhibit-read-only filename t insert-file-contents] 3)
  find-file-noselect-1(#<buffer common.mk.~3281~<2>> "/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~" nil nil "/ssh:user@host.obfuscated.sorry:/data/boost/searchme_webmap/tools/common.mk.~3281~" nil)
  find-file-noselect("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~")
  vc-find-revision(#("/ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk" 55 70 (face (diff-file-header diff-header) fontified t)) nil)
  ediff-vc-revision-other-window(nil)
  byte-code("ŠÆ\b!ˆp\x11Ç \x12)Š\vȘ„\x16\0Æ\v!ˆp\x14Ç \x15)ÉÊË\nDÌ\vȘË\rDEF\x0e\rB\x16\rʇ" [rev1 rev1buf file1 rev2 rev2buf file2 ediff-vc-revision-other-window buffer-file-name "" lambda nil ediff-delete-version-file or startup-hooks] 7)
  ediff-vc-internal("" "" nil)
  ediff-revision(nil)
  call-interactively(ediff-revision t nil)
  execute-extended-command(nil)
  call-interactively(execute-extended-command nil nil)


If Emacs crashed, and you have the Emacs process in the gdb debugger,
please include the output from the following gdb commands:
    `bt full' and `xbacktrace'.
If you would like to further debug the crash, please read the file
/Applications/Emacs.app/Contents/Resources/etc/DEBUG for instructions.


In GNU Emacs 23.0.91.1 (i386-apple-darwin9.6.0, NS apple-appkit-949.43)
 of 2009-03-05 on black.local
Windowing system distributor `Apple', version 10.3.949
configured using `configure  '--with-ns''

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: nil
  value of $XMODIFIERS: nil
  locale-coding-system: nil
  default-enable-multibyte-characters: t

Major mode: Debugger

Minor modes in effect:
  diff-auto-refine-mode: t
  shell-dirtrack-mode: t
  show-paren-mode: t
  server-mode: t
  global-auto-revert-mode: t
  delete-selection-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  global-auto-composition-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
C-, C-x C-n M-! s v n SPC u p & <return> C-g C-g C-p 
C-n M-! M-p C-. SPC - - n o - a u t h - c a c h e <return> 
y e s <return> <down-mouse-1> <mouse-1> <down-mouse-1> 
<mouse-1> C-x C-k C-x C-n M-! M-p C-. C-. C-. C-. SPC 
- - u s e r = d a v e <return> M-! s v n SPC - - h 
e l p SPC u p <return> M-! M-p M-p C-. C-. C-. C-. 
C-. C-. C-, C-b C-d n a m e SPC <return> a n d b 4 
a c k <return> M-! s v n SPC d i f f SPC - d u r <backspace> 
<backspace> <backspace> <backspace> <backspace> <return> 
C-x C-n M-x d i f f - m o 9 d <tab> <backspace> <backspace> 
d <tab> <return> n <return> C-n C-n C-p C-n C-p C-n 
C-p C-p C-p C-n C-n C-n C-n C-p C-n <down-mouse-1> 
<mouse-1> M-x e d i f f - r e v i <tab> <return> <return> 
<return> <return> C-n C-n C-p C-p C-p C-p C-p C-p M-x 
e d i f f - b u g <tab> <tab> <backspace> <backspace> 
<backspace> <tab> <tab> - b u g f <backspace> <tab> 
<tab> C-g M-x r e p o r t - b u g <tab> <return> R 
e m o t e SPC e d i f f - <backspace> <backspace> <backspace> 
<backspace> <backspace> <backspace> <backspace> <backspace> 
<backspace> <backspace> <backspace> <backspace> <backspace> 
e d i f f - r e v i s i o n SPC v i a C-g C-g C-x b 
* B a <tab> <return> q C-x C-b M-x M-p M-p <return> 
<return> <return> <return> C-p C-SPC M-> C-g M-x M-p 
M-p <return>

Recent messages:
Hunk already applied
Checking out /ssh:user@host.obfuscated.sorry:/home/boost/searchme_webmap/tools/common.mk.~3281~...done
Wrote /var/folders/w6/w6aHCL+5EVeBUsDYKAF0pU+++TI/-Tmp-/tramp.401Znj.mk
byte-code: Wrong type argument: integerp, nil
Making completion list...
Quit [3 times]
Back to top level.
Wrote /var/folders/w6/w6aHCL+5EVeBUsDYKAF0pU+++TI/-Tmp-/tramp.401mxp.mk
Entering debugger...
Mark set
Quit
-- 
Dave Abrahams
BoostPro Computing
http://www.boostpro.com