[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff.el,v |
Date: |
Wed, 09 Jan 2008 06:16:11 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/01/09 06:16:09
Index: ediff.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- ediff.el 8 Jan 2008 20:45:04 -0000 1.94
+++ ediff.el 9 Jan 2008 06:16:06 -0000 1.95
@@ -8,7 +8,7 @@
;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.81.2" "The current version of Ediff")
-(defconst ediff-date "August 18, 2007" "Date of last update")
+(defconst ediff-date "January 09, 2008" "Date of last update")
;; This file is part of GNU Emacs.
@@ -361,7 +361,8 @@
(list (cons 'ediff-job-name job-name))
merge-buffer-file)))
-(declare-function diff-latest-backup-file "diff" (fn))
+;; declare-function does not exist in XEmacs
+;;(declare-function diff-latest-backup-file "diff" (fn)))
;;;###autoload
(defalias 'ediff 'ediff-files)
@@ -1427,7 +1428,7 @@
(format "Ediff %s of %s" ediff-version ediff-date)))
;; info is run first, and will autoload info.el.
-(declare-function Info-goto-node "info" (nodename &optional fork))
+;;(declare-function Info-goto-node "info" (nodename &optional fork))
;;;###autoload
(defun ediff-documentation (&optional node)