summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2004-03-26 15:16:42 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2004-03-26 15:16:42 +0000
commit7d0b18b11a00ccd546bd4b902a990cf66cf19835 (patch)
treeb132084739b772515f2ec988fdff465e3bf0a064 /lisp/ediff-init.el
parente09dc079db34ea6a3e49eba722edc13ca76ee593 (diff)
downloademacs-7d0b18b11a00ccd546bd4b902a990cf66cf19835.tar.gz
(ediff-hide-face): Check that facemenu-unlisted-faces is bound before using it.
(ediff-verbose-p): Make it into a var since it's not constant.
Diffstat (limited to 'lisp/ediff-init.el')
-rw-r--r--lisp/ediff-init.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 4f5786651f5..81299b9c63a 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1,6 +1,6 @@
;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
@@ -895,7 +895,8 @@ to temp files when Ediff needs to find fine differences."
(sit-for 1)))))
(defun ediff-hide-face (face)
- (if (and (ediff-has-face-support-p) ediff-emacs-p)
+ (if (and (ediff-has-face-support-p) (boundp 'add-to-list)
+ (boundp 'facemenu-unlisted-faces))
(add-to-list 'facemenu-unlisted-faces face)))
@@ -1288,7 +1289,7 @@ This property can be toggled interactively."
;;; Misc
;; if nil, this silences some messages
-(defconst ediff-verbose-p t)
+(defvar ediff-verbose-p t)
(defcustom ediff-autostore-merges 'group-jobs-only
"*Save the results of merge jobs automatically.