[Emacs-diffs] Changes to emacs/lisp/ediff-help.el

[Michael Kifer]

Index: emacs/lisp/ediff-help.el
diff -c emacs/lisp/ediff-help.el:1.6 emacs/lisp/ediff-help.el:1.7
*** emacs/lisp/ediff-help.el:1.6        Mon Jul 16 03:46:48 2001
--- emacs/lisp/ediff-help.el    Mon Jan  7 23:36:01 2002
***************
*** 1,8 ****
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
! ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 1,8 ----
  ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
  
! ;; Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 190,201 ****
    (let ((pos (ediff-event-point last-command-event))
        overl cmd)
  
!     (if ediff-xemacs-p
!       (setq overl (extent-at pos (current-buffer) 'ediff-help-info)
!             cmd   (ediff-overlay-get overl 'ediff-help-info))
!       (setq cmd (car (mapcar (lambda (elt)
!                              (overlay-get elt 'ediff-help-info))
!                            (overlays-at pos)))))
      
      (if (not (stringp cmd))
        (error "Hmm...  I don't see an Ediff command around here..."))
--- 190,204 ----
    (let ((pos (ediff-event-point last-command-event))
        overl cmd)
  
!     (ediff-cond-compile-for-xemacs-or-emacs
!      ;; xemacs
!      (setq overl (extent-at pos (current-buffer) 'ediff-help-info)
!          cmd   (ediff-overlay-get overl 'ediff-help-info))
!      ;; emacs
!      (setq cmd (car (mapcar (lambda (elt)
!                             (overlay-get elt 'ediff-help-info))
!                           (overlays-at pos))))
!      )
      
      (if (not (stringp cmd))
        (error "Hmm...  I don't see an Ediff command around here..."))