diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-09 08:52:57 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-09 08:52:57 +0000 |
| commit | 1af74d06e5bdafad9d629d2ed729c5d743cfaf0f (patch) | |
| tree | 0360965ec0ad2736ffee01cce4f040c6b0a99133 /lisp/ediff-init.el | |
| parent | eceb3266a1f66a0034954aa82efbb20a5be959f8 (diff) | |
| parent | 4b70e299ef66906fd285198003c72a1439d1f252 (diff) | |
| download | emacs-1af74d06e5bdafad9d629d2ed729c5d743cfaf0f.tar.gz emacs-1af74d06e5bdafad9d629d2ed729c5d743cfaf0f.tar.bz2 emacs-1af74d06e5bdafad9d629d2ed729c5d743cfaf0f.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 21bf73ff76a..21e6bf660ee 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1410,7 +1410,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. |