Pulling just now I get: ,---- | $ git checkout master | Switched to branch 'master' | Your branch is behind 'origin/master' by 15 commits, and can be fast-forwarded. | | $ tsocks make update | git remote update | Fetching origin | Fetching github | Fetching org-odt | git pull | Updating 946230b..4721052 | Fast-forward | UTILITIES/org-fixup.el | 66 ++++++++++++++++------- | contrib/lisp/org-e-ascii.el | 86 ++++++++++++----------------- | contrib/lisp/org-e-html.el | 7 +-- | contrib/lisp/org-e-latex.el | 7 +-- | contrib/lisp/org-e-odt.el | 7 +-- | contrib/lisp/org-element.el | 16 +++--- | contrib/lisp/org-export.el | 111 ++++++++++++++++++------------------- | default.mk | 41 +++++++------- | lisp/org-agenda.el | 4 +- | lisp/org-bbdb.el | 2 +- | lisp/org-bibtex.el | 14 +++--- | lisp/org-clock.el | 4 +- | lisp/org-exp.el | 2 +- | lisp/org-publish.el | 2 +- | lisp/org.el | 37 +++++++------ | targets.mk | 10 ++-- | testing/lisp/test-org-element.el | 8 ++- | testing/lisp/test-org-export.el | 109 +++++++++++++++++++++++++------------ | 18 files changed, 291 insertions(+), 242 deletions(-) | make -C doc info | make[1]: Entering directory `/home/nick/src/emacs/org/org-mode/doc' | make[1]: Nothing to be done for `info'. | make[1]: Leaving directory `/home/nick/src/emacs/org/org-mode/doc' | make -C doc clean | make[1]: Entering directory `/home/nick/src/emacs/org/org-mode/doc' | rm -f org *.pdf *.html *_letter.tex org-version.inc \ | *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs \ | *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps | make[1]: Leaving directory `/home/nick/src/emacs/org/org-mode/doc' | make -C doc all; make -C etc all; make -C lisp all; | make[1]: Entering directory `/home/nick/src/emacs/org/org-mode/doc' | org-version: 7.8.10 (release_7.8.10-582-g472105) | makeinfo --no-split org.texi -o org | make[1]: Leaving directory `/home/nick/src/emacs/org/org-mode/doc' | make[1]: Entering directory `/home/nick/src/emacs/org/org-mode/etc' | make[1]: Nothing to be done for `all'. | make[1]: Leaving directory `/home/nick/src/emacs/org/org-mode/etc' | make[1]: Entering directory `/home/nick/src/emacs/org/org-mode/lisp' | rm -f org-version.el org-install.el org-version.elc org-install.elc | org-version: 7.8.10 (release_7.8.10-582-g472105) | Loading /home/nick/src/emacs/org/org-mode/lisp/org-compat.el (source)... | Loading /home/nick/src/emacs/org/org-mode/UTILITIES/org-fixup.el (source)... | Saving file /home/nick/src/emacs/org/org-mode/lisp/org-version.el... | Loading vc-git... | Wrote /home/nick/src/emacs/org/org-mode/lisp/org-version.el | org-install: 7.8.10 (release_7.8.10-582-g472105) | Loading /home/nick/src/emacs/org/org-mode/lisp/org-compat.el (source)... | Loading /home/nick/src/emacs/org/org-mode/UTILITIES/org-fixup.el (source)... | Wrong number of arguments: (lambda nil (with-temp-buffer (set-visited-file-name "org-install.el") (insert ";;; org-install.el --- autogenerated file, do not edit | ;; | ;;; Code: | ") (let ((files (directory-files default-directory nil "^\\(org\\|ob\\)\\(-.*\\)?\\.el$"))) (mapc (lambda (f) (generate-file-autoloads f)) files)) (insert " | (provide 'org-install) | ") (insert " | ;; Local Variables: | ;; version-control: never | ") (insert ";; no-byte-compile: t | ;; no-update-autoloads: t | ") (insert ";; coding: utf-8 | ;; End: | ;;; org-install.el ends here | ") (toggle-read-only 0) (save-buffer))), 1 | make[1]: *** [org-install.el] Error 255 | make[1]: Leaving directory `/home/nick/src/emacs/org/org-mode/lisp' | make: *** [all] Error 2 | $ `----
Nick