emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

23.0.60; Ediff's Apply Patch To A File fails


From: Peter Dyballa
Subject: 23.0.60; Ediff's Apply Patch To A File fails
Date: Sat, 15 Mar 2008 23:37:37 +0100

Hello!

I received files with patches. I opened one in GNU Emacs. When I chose from the Tools menu "Apply Patch To A File" it failed. When I had open in the other window the ELisp file to be patched, it worked with "Apply Patch To A Buffer" from the Tools menu. Is this the correct behaviour?

The patch(es) start like:

*** /tmp/tramp.el.~2.629.~      Fri Mar 14 09:46:55 2008
--- /tmp/tramp.el       Fri Mar 14 09:46:55 2008
***************
*** 3051,3073 ****
First arg OP is either `copy' or `rename' and indicates the operation.
  FILENAME is the source file, NEWNAME the target file.
KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
!   (let ((modtime (nth 5 (file-attributes filename))))
...


or:

*** /home/albinus/src/tramp/lisp/tramp.el.~2.629.~ 2008-02-09 09:43:33.000000000 +0100 --- /home/albinus/src/tramp/lisp/tramp.el 2008-03-15 17:57:33.000000000 +0100
***************
*** 3051,3073 ****
First arg OP is either `copy' or `rename' and indicates the operation.
  FILENAME is the source file, NEWNAME the target file.
KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
!   (let ((modtime (nth 5 (file-attributes filename))))




In GNU Emacs 23.0.60.2 (powerpc-apple-darwin8.11.0, X toolkit, Xaw3d scroll bars)
 of 2008-03-15 on Latsche.local
Windowing system distributor `The XFree86 Project, Inc', version 11.0.40400000 configured using `configure '--without-pop' '--without-sound' '-- with-xft' '--with-libotf' '--with-dbus' '--with-x-toolkit=athena' '-- enable-font-backend' '--enable-locallisppath=/Library/Application Support/Emacs/calendar23:/Library/Application Support/Emacs/caml:/ Library/Application Support/Emacs:/sw/share/emacs21/site-lisp/elib' 'PKG_CONFIG_PATH=/sw/lib/freetype219/lib/pkgconfig:/sw/lib/ fontconfig2/lib/pkgconfig:/sw/lib/pkgconfig:/sw/lib/system-openssl/ lib/pkgconfig:/sw/share/pkgconfig:/usr/lib/pkgconfig:/usr/local/lib/ pkgconfig:/usr/local/clamXav/lib/pkgconfig:/usr/X11R6/lib/pkgconfig' 'CPPFLAGS=-no-cpp-precomp -D__BIND_NOSTATIC -I/sw/lib/fontconfig2/ include -I/sw/lib/freetype219/include -I/sw/lib/freetype219/include/ freetype2 -idirafter /usr/X11R6/include' 'CFLAGS=-ggdb -gfull - bind_at_load -Wno-pointer-sign -pipe -fPIC -mcpu=7450 -mtune=7450 - mno-powerpc64 -fast -mpim-altivec -ftree-vectorize -freorder-blocks- and-partition -fno-crossjumping' 'LDFLAGS=-bind_at_load -dead_strip - multiply_defined suppress -L/sw/lib/fontconfig2/lib -L/sw/lib/ freetype219/lib''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: de_DE.UTF-8
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: de_DE.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default-enable-multibyte-characters: t

Major mode: Dired by name

Minor modes in effect:
  TeX-PDF-mode: t
  shell-dirtrack-mode: t
  show-paren-mode: t
  display-time-mode: t
  desktop-save-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
  blink-cursor-mode: t
  global-auto-composition-mode: t
  auto-composition-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t


--
Mit friedvollen Grüßen

  Pete

"A designer knows he has arrived at perfection not when there is no longer anything to add, but when there is no longer anything to take away."
                                – Antoine de Saint-Exupéry







reply via email to

[Prev in Thread] Current Thread [Next in Thread]