/[emacs]/emacs/lisp/smerge-mode.el
ViewVC logotype

Diff of /emacs/lisp/smerge-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.22 by miles, Mon Sep 1 15:45:14 2003 UTC revision 1.23 by fx, Mon Oct 6 16:32:31 2003 UTC
# Line 182  Can be nil if the style is undecided, or Line 182  Can be nil if the style is undecided, or
182  - `diff3-A'")  - `diff3-A'")
183    
184  ;; Compiler pacifiers  ;; Compiler pacifiers
185  (defvar font-lock-mode)  (eval-when-compile
186  (defvar font-lock-keywords)    (unless (fboundp 'font-lock-fontify-region)
187        (autoload 'font-lock-fontify-region "font-lock")))
188    
189  ;;;;  ;;;;
190  ;;;; Actual code  ;;;; Actual code

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26