diff options
| author | Stefan Monnier | 2007-09-16 22:15:22 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-09-16 22:15:22 +0000 |
| commit | 9d2fec03a1ae3a000e02036093c8f4da6a0c1a6d (patch) | |
| tree | 999edd7996d5a8932aca9b0fa2182c059a4be0fd | |
| parent | 480ecb6b5ce579af4008d4556bc71fa08098aa94 (diff) | |
| download | emacs-9d2fec03a1ae3a000e02036093c8f4da6a0c1a6d.tar.gz emacs-9d2fec03a1ae3a000e02036093c8f4da6a0c1a6d.zip | |
(ediff-verbose-p): This var is not a constant.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ediff-init.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6fc03d826e5..63d75b38140 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-09-16 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * ediff-init.el (ediff-verbose-p): This var is not a constant. | ||
| 4 | |||
| 1 | 2007-09-16 Drew Adams <drew.adams@oracle.com> | 5 | 2007-09-16 Drew Adams <drew.adams@oracle.com> |
| 2 | 6 | ||
| 3 | * cus-edit (custom-face-edit-activate): Doc fix. | 7 | * cus-edit (custom-face-edit-activate): Doc fix. |
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 88438379273..ea9d1b214be 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el | |||
| @@ -1406,7 +1406,7 @@ This property can be toggled interactively." | |||
| 1406 | ;;; Misc | 1406 | ;;; Misc |
| 1407 | 1407 | ||
| 1408 | ;; if nil, this silences some messages | 1408 | ;; if nil, this silences some messages |
| 1409 | (defconst ediff-verbose-p t) | 1409 | (defvar ediff-verbose-p t) |
| 1410 | 1410 | ||
| 1411 | (defcustom ediff-autostore-merges 'group-jobs-only | 1411 | (defcustom ediff-autostore-merges 'group-jobs-only |
| 1412 | "*Save the results of merge jobs automatically. | 1412 | "*Save the results of merge jobs automatically. |