Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(ediff-hide-face): Check that facemenu-unlisted-faces is bound before using it.

Browse source 
(ediff-verbose-p): Make it into a var since it's not constant.
This commit is contained in:
Stefan Monnier 2004-03-26 15:16:42 +00:00
parent e09dc079db
commit 7d0b18b11a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ediff-init.el
View file

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