diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-04-17 12:44:00 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-04-17 12:44:00 +0200 |
| commit | 4d8c2823b66699296a78be57af942012f5afcec3 (patch) | |
| tree | e62d783c8a7354bba98eb974eccece2905dbb5f8 /Makefile | |
| parent | c271016846bc03f9362a87ab7b491f9a0f3f5a75 (diff) | |
| parent | 2f8c330e566476a5bbf92d3294d4bc209ad52268 (diff) | |
Merge branch 'master' into next
Conflicts:
Makefile
magit.el
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -153,6 +153,7 @@ lisp: $(ELCS) magit-version.el magit-autoloads.el (when (file-exists-p \"$@\")\ (delete-file \"$@\"))\ (setq with-editor-emacsclient-executable nil)\ + (setq magit-last-seen-setup-instructions \"9999\")\ (fset 'message* (symbol-function 'message))\ (fset 'message (lambda (f &rest a)\ (unless (equal f \"Wrote %s\")\ @@ -177,6 +178,7 @@ magit-autoloads.el: $(ELS) @$(BATCH) -eval "(progn\ (fset 'message (lambda (&rest _)))\ (setq vc-handled-backends nil)\ + (setq magit-last-seen-setup-instructions \"9999\")\ (defvar generated-autoload-file nil)\ (let ((generated-autoload-file \"$(CURDIR)/magit-autoloads.el\")\ (make-backup-files nil))\ @@ -245,11 +247,16 @@ install-docs: docs $(CP) AUTHORS.md $(DESTDIR)$(docdir) test: - @$(BATCH) -l t/magit-tests.el -f ert-run-tests-batch-and-exit + @$(BATCH) --eval "(progn\ + (setq magit-last-seen-setup-instructions \"9999\")\ + (load-file \"t/magit-tests.el\")\ + (ert-run-tests-batch-and-exit))" test-interactive: - @$(EMACSBIN) -Q $(LOAD_PATH) --eval "\ - (progn (load-file \"t/magit-tests.el\") (ert t))" + @$(EMACSBIN) -Q $(LOAD_PATH) --eval "(progn\ + (setq magit-last-seen-setup-instructions \"9999\")\ + (load-file \"t/magit-tests.el\")\ + (ert t))" clean: @printf "Cleaning...\n" |