From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Dave Love Newsgroups: gmane.emacs.bugs Subject: smerge fix Date: 21 Aug 2002 18:55:29 +0100 Sender: bug-gnu-emacs-admin@gnu.org Message-ID: NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1029952507 18550 127.0.0.1 (21 Aug 2002 17:55:07 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 21 Aug 2002 17:55:07 +0000 (UTC) Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 17hZh7-0004oh-00 for ; Wed, 21 Aug 2002 19:55:02 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10) id 17hZiH-0005HA-00; Wed, 21 Aug 2002 13:56:13 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10) id 17hZhd-00057b-00 for bug-gnu-emacs@gnu.org; Wed, 21 Aug 2002 13:55:33 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10) id 17hZhb-00057I-00 for bug-gnu-emacs@gnu.org; Wed, 21 Aug 2002 13:55:32 -0400 Original-Received: from albion.dl.ac.uk ([148.79.80.39]) by monty-python.gnu.org with esmtp (Exim 4.10) id 17hZha-000578-00 for bug-gnu-emacs@gnu.org; Wed, 21 Aug 2002 13:55:31 -0400 Original-Received: from fx by albion.dl.ac.uk with local (Exim 3.35 #1 (Debian)) id 17hZhZ-0005Uc-00 for ; Wed, 21 Aug 2002 18:55:29 +0100 Original-To: bug-gnu-emacs@gnu.org Original-Lines: 26 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 Errors-To: bug-gnu-emacs-admin@gnu.org X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Bug reports for GNU Emacs, the Swiss army knife of text editors List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.bugs:3268 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:3268 This fixes font-lock variables appearing to be loaded from smerge-mode according to loadhist. It's confusing anyhow, but disastrous if you unload smerge-mode. *** smerge-mode.el.~1.14.4.1.~ Fri Nov 30 18:57:07 2001 --- smerge-mode.el Sun Aug 18 23:26:31 2002 *************** *** 181,188 **** - `diff3-A'") ;; Compiler pacifiers ! (defvar font-lock-mode) ! (defvar font-lock-keywords) (eval-when-compile (unless (fboundp 'font-lock-fontify-region) (autoload 'font-lock-fontify-region "font-lock"))) --- 181,189 ---- - `diff3-A'") ;; Compiler pacifiers ! (eval-when-compile ! (defvar font-lock-mode) ! (defvar font-lock-keywords)) (eval-when-compile (unless (fboundp 'font-lock-fontify-region) (autoload 'font-lock-fontify-region "font-lock")))