X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/08b3caa982199bd7939d9d6877203ada5d0083b5..2b4e72e1d5ccecf590125c022a78a88755c779e5:/lisp/ediff-vers.el diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index fdd68a8bbb..a3a855278e 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -1,7 +1,7 @@ ;;; ediff-vers.el --- version control interface to Ediff ;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Author: Michael Kifer @@ -43,7 +43,7 @@ ;; end pacifier (defcustom ediff-keep-tmp-versions nil - "*If t, do not delete temporary previous versions for the files on which + "If t, do not delete temporary previous versions for the files on which comparison or merge operations are being performed." :type 'boolean :group 'ediff-vers @@ -232,11 +232,11 @@ comparison or merge operations are being performed." (provide 'ediff-vers) -;;; Local Variables: -;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) -;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) -;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) -;;; End: +;; Local Variables: +;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) +;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) +;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) +;; End: ;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf ;;; ediff-vers.el ends here