diff options
Diffstat (limited to 'lisp/vc/ediff-merg.el')
| -rw-r--r-- | lisp/vc/ediff-merg.el | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index cadc15325c7..4e17dbeaefa 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el @@ -1,4 +1,4 @@ -;;; ediff-merg.el --- merging utilities -*- lexical-binding: nil; -*- +;;; ediff-merg.el --- merging utilities -*- lexical-binding:t -*- ;; Copyright (C) 1994-2019 Free Software Foundation, Inc. @@ -382,12 +382,4 @@ Combining is done according to the specifications in variable (provide 'ediff-merg) - - -;; 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: - ;;; ediff-merg.el ends here |