diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2005-08-24 11:36:27 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2005-08-24 11:36:27 +0000 |
| commit | bbf40036a9d95bb8e4204d89e83372af297102c5 (patch) | |
| tree | c0a3b34cc2ff0c26b2a8a5d492bdaf04a0b5a6e2 | |
| parent | 63f0a16643b6e7d0fa0707a955bc27f46e8e7f36 (diff) | |
| download | emacs-bbf40036a9d95bb8e4204d89e83372af297102c5.tar.gz | |
(merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,
diff-vector, valid-diff): Defvar at compile time to silence the byte-compiler.
| -rw-r--r-- | lisp/ChangeLog | 21 | ||||
| -rw-r--r-- | lisp/emerge.el | 6 |
2 files changed, 27 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3614df83f3..36352a189c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2005-08-24 Juanma Barranquero <lekktu@gmail.com> + + * ibuffer.el (ibuffer-compile-make-eliding-form) + (ibuffer-check-formats): Use `with-no-warnings' to hide references + to `ibuffer-elide-long-columns' (which is defined on ibuffer.el, + so it's silly to get warnings for it). + (ibuffer-auto-mode, ibuffer-cached-filter-formats) + (ibuffer-compiled-filter-formats, ibuffer-filter-format-alist) + (ibuffer-filter-group-kill-ring, ibuffer-filter-groups) + (ibuffer-filtering-qualifiers, ibuffer-hidden-filter-groups) + (ibuffer-inline-columns, ibuffer-show-empty-filter-groups) + (ibuffer-tmp-hide-regexps, ibuffer-tmp-show-regexps): + Defvar at compile time. + (ibuffer-compiled-formats, ibuffer-cached-eliding-string) + (ibuffer-cached-formats, ibuffer-cached-elide-long-columns): + Declare them before use. + + * emerge.el (merge-begin, merge-end, template, A-begin, A-end) + (B-begin, B-end, diff, diff-vector, valid-diff): Defvar at compile + time to silence the byte-compiler. + 2005-08-24 Carsten Dominik <dominik@science.uva.nl> * bookmark.el (bookmark-after-jump-hook): New hook. diff --git a/lisp/emerge.el b/lisp/emerge.el index 1f105163f46..e55a75ef2fc 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -44,6 +44,12 @@ ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers] ;;;###autoload '("Buffers..." . emerge-buffers)) +(eval-when-compile + ;; There aren't really global variables, just dynamic bindings + (defvar merge-begin) (defvar merge-end) (defvar template) + (defvar A-begin) (defvar A-end) (defvar B-begin) (defvar B-end) + (defvar diff) (defvar diff-vector) (defvar valid-diff)) + ;;; Macros (defmacro emerge-eval-in-buffer (buffer &rest forms) |