all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dave Love <d.love@dl.ac.uk>
Subject: smerge fix
Date: 21 Aug 2002 18:55:29 +0100	[thread overview]
Message-ID: <rzqy9b0cd0u.fsf@albion.dl.ac.uk> (raw)

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")))

             reply	other threads:[~2002-08-21 17:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-08-21 17:55 Dave Love [this message]
2002-08-24  2:32 ` smerge fix Richard Stallman
2002-08-29 22:52   ` Dave Love
2002-08-30  6:11     ` Richard Stallman
2002-08-31 17:40       ` Dave Love

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=rzqy9b0cd0u.fsf@albion.dl.ac.uk \
    --to=d.love@dl.ac.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.