mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Use find-file-hook instead of find-file-hooks.

Browse source
This commit is contained in:
Stefan Monnier 2002-08-15 00:48:20 +00:00
parent 0677236392
commit 1a4914f340
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/smerge-mode.el
View file

@ -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: