Show
Ignore:
Timestamp:
04/16/06 21:46:31 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/ediff.el

    r4037 r4058  
    88;; Keywords: comparing, merging, patching, tools, unix 
    99 
    10 (defconst ediff-version "2.80.1" "The current version of Ediff") 
    11 (defconst ediff-date "November 25, 2005" "Date of last update") 
     10(defconst ediff-version "2.81" "The current version of Ediff") 
     11(defconst ediff-date "February 18, 2006" "Date of last update") 
    1212 
    1313 
    …… 
    108108;;; Code: 
    109109 
    110 (provide 'ediff) 
    111110 
    112111;; Compiler pacifier 
    …… 
    122121(eval-when-compile 
    123122  (let ((load-path (cons (expand-file-name ".") load-path))) 
     123    (provide 'ediff) ; to break recursive load cycle 
    124124    (or (featurep 'ediff-init) 
    125125        (load "ediff-init.el" nil nil 'nosuffix)) 
    …… 
    13751375   (read-buffer 
    13761376    "Which buffer to patch? " 
    1377     (current-buffer)))) 
     1377    (ediff-other-buffer patch-buf)))) 
    13781378 
    13791379 
    …… 
    15341534(run-hooks 'ediff-load-hook) 
    15351535 
     1536(provide 'ediff) 
     1537 
     1538 
    15361539;;; Local Variables: 
    15371540;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)