diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-08-15 00:48:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-08-15 00:48:20 +0000 |
| commit | 1a4914f3407207b69a7ec96cec337fdc5125f3cf (patch) | |
| tree | a726f7d2779720159849d180df96572837440789 /lisp/smerge-mode.el | |
| parent | 067723639234bf58eeb593b7e38e6e7bb43af9d3 (diff) | |
| download | emacs-1a4914f3407207b69a7ec96cec337fdc5125f3cf.tar.gz | |
Use find-file-hook instead of find-file-hooks.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 5ce9328048d..83c2d6cb1ca 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.14 2001/07/31 08:28:43 gerd Exp $ +;; Revision: $Id: smerge-mode.el,v 1.15 2001/11/15 01:25:35 monnier Exp $ ;; This file is part of GNU Emacs. @@ -38,7 +38,7 @@ ;; (goto-char (point-min)) ;; (when (re-search-forward "^<<<<<<< " nil t) ;; (smerge-mode 1)))) -;; (add-hook 'find-file-hooks 'sm-try-smerge t) +;; (add-hook 'find-file-hook 'sm-try-smerge t) ;;; Todo: |