Remove the "Version" header in Org libraries (leave it in org.el).

Also remove blank lines before the ";;; org*el ends here" declarations. Having a "Version" header forced us to update every file when releasing a new version of Org; it also forced us to update every file when merging Org with Emacs trunk, thus cluttering the diffs between the previously merged version and the new one with useless information. Glenn Morris suggested this in emacs-devel: http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00322.html
2011-08-17 14:42:34 +02:00 · 2011-08-17 14:42:34 +02:00 · 58f1dbccf8
parent c25165c25d
commit 58f1dbccf8
116 changed files with 52 additions and 207 deletions
--- a/contrib/lisp/org-annotate-file.el
+++ b/contrib/lisp/org-annotate-file.el
@ -127,4 +127,5 @@ show the relevant section"
  (insert link))

 (provide 'org-annotate-file)
+
 ;;; org-annotate-file.el ends here
--- a/contrib/lisp/org-choose.el
+++ b/contrib/lisp/org-choose.el
@ -538,4 +538,5 @@ NEW-MARK and OLD-MARK are the text of the new and old marks."
 ;;;_  + End:

 ;;;_ , End
+
 ;;; org-choose.el ends here
--- a/contrib/lisp/org-collector.el
+++ b/contrib/lisp/org-collector.el
@ -222,4 +222,5 @@ variables and values specified in props"
    (delq nil results)) '()))

 (provide 'org-collector)
+
 ;;; org-collector ends here
--- a/contrib/lisp/org-elisp-symbol.el
+++ b/contrib/lisp/org-elisp-symbol.el
@ -157,5 +157,4 @@
 ;;;;  User Options, Variables
 ;;;;##########################################################################

-
 ;;; org-elisp-symbol.el ends here
--- a/contrib/lisp/org-eval-light.el
+++ b/contrib/lisp/org-eval-light.el
@ -197,4 +197,5 @@ commented by `org-eval-light-make-region-example'."
    ad-do-it))

 (provide 'org-eval-light)
+
 ;;; org-eval-light.el ends here
--- a/contrib/lisp/org-git-link.el
+++ b/contrib/lisp/org-git-link.el
@ -216,4 +216,5 @@
          (buffer-substring 12 (1- (point-max))))))) ; to strip off final newline

 (provide 'org-git-link)
+
 ;;; org-git-link.el ends here
--- a/contrib/lisp/org-learn.el
+++ b/contrib/lisp/org-learn.el
@ -174,6 +174,4 @@ OF matrix."

 (provide 'org-learn)

-
-
 ;;; org-learn.el ends here
--- a/contrib/lisp/org-panel.el
+++ b/contrib/lisp/org-panel.el
@ -637,6 +637,7 @@ button changes the binding of the arrow keys."

 (provide 'org-panel)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 ;;; org-panel.el ends here


--- a/contrib/lisp/org-toc.el
+++ b/contrib/lisp/org-toc.el
@ -485,6 +485,4 @@ status."
 ;;;;  User Options, Variables
 ;;;;##########################################################################

-
-
 ;;; org-toc.el ends here
--- a/contrib/lisp/org-velocity.el
+++ b/contrib/lisp/org-velocity.el
@ -711,4 +711,5 @@ file.  Calling with ARG forces current file."
 	(delete-other-windows)))))

 (provide 'org-velocity)
+
 ;;; org-velocity.el ends here
--- a/contrib/lisp/org-wikinodes.el
+++ b/contrib/lisp/org-wikinodes.el
@ -334,6 +334,4 @@ with working links."

 (provide 'org-wikinodes)

-
-
 ;;; org-wikinodes.el ends here
--- a/contrib/lisp/org-xhtml.el
+++ b/contrib/lisp/org-xhtml.el
@ -1833,5 +1833,4 @@ lang=\"%s\" xml:lang=\"%s\">

 (provide 'org-xhtml)

-
 ;;; org-xhtml.el ends here
--- a/contrib/lisp/org2rem.el
+++ b/contrib/lisp/org2rem.el
@ -648,6 +648,4 @@ a time), or the day by one (if it does not contain a time)."

 (provide 'org2rem)

-
-
 ;;; org-exp.el ends here
--- a/contrib/lisp/orgtbl-sqlinsert.el
+++ b/contrib/lisp/orgtbl-sqlinsert.el
@ -112,4 +112,5 @@ to sanitize STR for use in SQL statements."
        (t nil)))

 (provide 'orgtbl-sqlinsert)
+
 ;;; orgtbl-sqlinsert.el ends here
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte, Dan Davison
 ;; Keywords: literate programming, reproducible research, R, statistics
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-asymptote.el
+++ b/lisp/ob-asymptote.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@ -5,7 +5,6 @@
 ;; Author: Joel Boehland, Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte, Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-java.el
+++ b/lisp/ob-java.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, js
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;;; License:

--- a/lisp/ob-keys.el
+++ b/lisp/ob-keys.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-ledger.el
+++ b/lisp/ob-ledger.el
@ -5,7 +5,6 @@
 ;; Author: Eric S Fraga
 ;; Keywords: literate programming, reproducible research, accounting
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@ -5,7 +5,6 @@
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming
 ;; Homepage: https://github.com/mjago/ob-lilypond
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@ -5,7 +5,6 @@
 ;; Author: Joel Boehland, Eric Schulte, David T. O'Toole <dto@gnu.org>
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte, Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@ -5,7 +5,6 @@
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@ -6,7 +6,6 @@
 ;;	   Eric Schulte
 ;; Keywords: literate programming, reproducible research, maxima
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-mscgen.el
+++ b/lisp/ob-mscgen.el
@ -5,7 +5,6 @@
 ;; Author: Juan Pechiar
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@ -5,7 +5,6 @@
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@ -5,7 +5,6 @@
 ;; Author: Dan Davison, Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@ -5,7 +5,6 @@
 ;; Author: Zhang Weize
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte, Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte, Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, scheme
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;;; License:

--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@ -5,7 +5,6 @@
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-sh.el
+++ b/lisp/ob-sh.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/ob.el
+++ b/lisp/ob.el
@ -5,7 +5,6 @@
 ;; Author: Eric Schulte, Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -8465,6 +8464,4 @@ belonging to the \"Work\" category."

 (provide 'org-agenda)

-
-
 ;;; org-agenda.el ends here
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -482,6 +481,4 @@ This command is set with the variable `org-archive-default-command'."

 (provide 'org-archive)

-
-
 ;;; org-archive.el ends here
--- a/lisp/org-ascii.el
+++ b/lisp/org-ascii.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -725,5 +724,4 @@ publishing directory."

 (provide 'org-ascii)

-
 ;;; org-ascii.el ends here
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@ -4,7 +4,6 @@

 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
-;; Version: 7.7

 ;; This file is part of GNU Emacs.
 ;;
@ -437,5 +436,4 @@ prefix."

 (provide 'org-attach)

-
 ;;; org-attach.el ends here
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@ -6,7 +6,6 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -391,6 +390,4 @@ END:VEVENT\n"

 (provide 'org-bbdb)

-
-
 ;;; org-bbdb.el ends here
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@ -2,7 +2,6 @@
 ;;
 ;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
-;; Version: 7.7
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
@ -632,6 +631,4 @@ include square brackets."

 (provide 'org-beamer)

-
-
 ;;; org-beamer.el ends here
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@ -6,7 +6,6 @@
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;;         Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -642,6 +641,4 @@ This function relies `org-search-view' to locate results."

 (provide 'org-bibtex)

-
-
 ;;; org-bibtex.el ends here
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -1505,6 +1504,4 @@ The template may still contain \"%?\" for cursor positioning."

 (provide 'org-capture)

-
-
 ;;; org-capture.el ends here
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -2034,6 +2033,44 @@ the currently selected interval size."
 	 (org-update-dblock)
 	 t)))))

+(defun org-clocktable-sort-clock-data (tables params)
+  "TABLES is a list of tables with clocking data as produced by
+`org-clock-get-table-data'.  PARAMS is the parameter property
+list obtained from the dynamic block defintion.
+
+When PARAMS contains a :SORT entry, sort the tables and the entries
+inside them accordnly:
+
+:SORT time-up or T, sorts by most time spent on top
+:SORT time-down, sorts by least time spent on top
+
+Returns the sorted table list"
+  (let ((sort (plist-get params :sort)))
+    (if (not sort) tables
+      (sort (mapcar
+             (lambda (table)
+               (list (nth 0 table)
+                     (nth 1 table)
+                     (sort
+                      (third table)
+                      (lambda (elem1 elem2)
+                        (let ((d1 (nth 3 elem1))
+                              (d2 (nth 3 elem2)))
+                          (cond ((memq sort '(t time-up))
+                                 (> d1 d2))
+                                ((eq sort 'time-down)
+                                 (< d1 d2))
+                                (t (error "Invalid :sort parameter %s" sort))))))))
+             tables)
+            (lambda (table1 table2)
+              (let ((d1 (nth 1 table1))
+                    (d2 (nth 1 table2)))
+                (cond ((memq sort '(t time-up))
+                       (> d1 d2))
+                      ((eq sort 'time-down)
+                       (< d1 d2))
+                      (t (error "Invalid :sort parameter %s" sort)))))))))
+
 (defun org-dblock-write:clocktable (params)
  "Write the standard clocktable."
  (setq params (org-combine-plists org-clocktable-defaults params))
@ -2051,7 +2088,6 @@ the currently selected interval size."
 			  'org-clocktable-write-default))
 	   cc range-text ipos pos one-file-with-archives
 	   scope-is-list tbls level)
-
      ;; Check if we need to do steps
      (when block
 	;; Get the range text for the header
@ -2120,7 +2156,8 @@ the currently selected interval size."
      (setq params (plist-put params :one-file-with-archives
 			      one-file-with-archives))

-      (funcall formatter ipos tbls params))))
+      (funcall formatter ipos
+	       (org-clocktable-sort-clock-data tbls params) params))))

 (defun org-clocktable-write-default (ipos tables params)
  "Write out a clock table at position IPOS in the current buffer.
@ -2639,7 +2676,5 @@ The details of what will be saved are regulated by the variable

 (provide 'org-clock)

-
-
 ;;; org-clock.el ends here

--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@ -6,7 +6,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -1525,6 +1524,4 @@ The string should be two numbers joined with a \"-\"."

 (provide 'org-colview)

-
-
 ;;; org-colview.el ends here
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -444,6 +443,4 @@ With two arguments, return floor and remainder of their quotient."

 (provide 'org-compat)

-
-
 ;;; org-compat.el ends here
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@ -4,7 +4,6 @@

 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el
-;; Version: 7.7
 ;; Keywords: org-mode
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: Peter Jones <pjones@pmade.com>
@ -252,6 +251,4 @@ nil      : Leave auto-save-mode enabled.

 (provide 'org-crypt)

-
-
 ;;; org-crypt.el ends here
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@ -3,10 +3,9 @@
 ;; Copyright (C) 2007-2011 Free Software Foundation, Inc.

 ;; Author: Paul Sexton <eeeickythump@gmail.com>
-;; Version: 7.7
+

 ;; Keywords: org, wp
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -539,5 +538,4 @@ a new topic."

 (provide 'org-ctags)

-
 ;;; org-ctags.el ends here
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -195,6 +194,4 @@ before running this command, even though the command tries to be smart."

 (provide 'org-datetree)

-
-
 ;;; org-datetree.el ends here
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@ -4,7 +4,6 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-docbook.el
-;; Version: 7.7
 ;; Author: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Keywords: org, wp, docbook
@ -1445,5 +1444,4 @@ the alist of previous items."

 (provide 'org-docbook)

-
 ;;; org-docbook.el ends here
--- a/lisp/org-docview.el
+++ b/lisp/org-docview.el
@ -5,7 +5,6 @@
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -88,6 +87,4 @@ and append it."

 (provide 'org-docview)

-
-
 ;;; org-docview.el ends here
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@ -6,7 +6,6 @@
 ;;         Ulf Stegemann <ulf at zeitform dot de>
 ;; Keywords: outlines, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -568,6 +567,4 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
 ;; coding: utf-8
 ;; End:

-
-
 ;;; org-entities.el ends here
--- a/lisp/org-exp-blocks.el
+++ b/lisp/org-exp-blocks.el
@ -3,7 +3,6 @@
 ;; Copyright (C) 2009-2011 Free Software Foundation, Inc.

 ;; Author: Eric Schulte
-;; Version: 7.7

 ;; This file is part of GNU Emacs.
 ;;
@ -376,5 +375,4 @@ other backends, it converts the comment into an EXAMPLE segment."

 (provide 'org-exp-blocks)

-
 ;;; org-exp-blocks.el ends here
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -3219,6 +3218,4 @@ The depends on the variable `org-export-copy-to-kill'."

 (provide 'org-exp)

-
-
 ;;; org-exp.el ends here
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -735,6 +734,4 @@ level org-n-level-faces"

 (provide 'org-faces)

-
-
 ;;; org-faces.el ends here
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -674,5 +673,4 @@ formatted as a string, not the original XML data."

 (provide 'org-feed)

-
 ;;; org-feed.el ends here
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -915,6 +914,4 @@ If LABEL is non-nil, delete that footnote instead."

 (provide 'org-footnote)

-
-
 ;;; org-footnote.el ends here
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@ -5,7 +5,6 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -1240,4 +1239,5 @@ PATH should be a list of steps, where each step has the form


 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 ;;; org-freemind.el ends here
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@ -6,7 +6,6 @@
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -291,5 +290,4 @@ If `org-store-link' was called with a prefix arg the meaning of
 (provide 'org-gnus)


-
 ;;; org-gnus.el ends here
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@ -5,7 +5,6 @@
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -358,6 +357,4 @@ current time."

 (provide 'org-habit)

-
-
 ;;; org-habit.el ends here
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -2612,5 +2611,4 @@ the alist of previous items."

 (provide 'org-html)

-
 ;;; org-html.el ends here
--- a/lisp/org-icalendar.el
+++ b/lisp/org-icalendar.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -684,5 +683,4 @@ a time), or the day by one (if it does not contain a time)."

 (provide 'org-icalendar)

-
 ;;; org-icalendar.el ends here
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@ -4,7 +4,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -322,5 +321,4 @@ Point is assumed to be at the beginning of a headline."

 (provide 'org-indent)

-
 ;;; org-indent.el ends here
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -77,6 +76,4 @@

 (provide 'org-info)

-
-
 ;;; org-info.el ends here
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@ -4,7 +4,6 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -253,6 +252,4 @@ default."

 (provide 'org-irc)

-
-
 ;;; org-irc.el ends here
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -204,6 +203,4 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
 (provide 'org-infojs)
 (provide 'org-jsinfo)

-
-
 ;;; org-jsinfo.el ends here
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@ -4,7 +4,6 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-latex.el
-;; Version: 7.7
 ;; Author: Bastien Guerry <bzg AT gnu DOT org>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
@ -2769,6 +2768,4 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (provide 'org-export-latex)
 (provide 'org-latex)

-
-
 ;;; org-latex.el ends here
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@ -6,7 +6,6 @@
 ;;	   Bastien Guerry <bzg AT gnu DOT org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -3207,5 +3206,4 @@ with overruling parameters for `org-list-to-generic'."

 (provide 'org-list)

-
 ;;; org-list.el ends here
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@ -5,7 +5,6 @@
 ;; Author: John Wiegley <johnw@gnu.org>
 ;;         Christopher Suckling <suckling at gmail dot com>

-;; Version: 7.7
 ;; Keywords: outlines, hypermedia, calendar, wp

 ;; This file is part of GNU Emacs.
@ -214,6 +213,4 @@ list of message:// links to flagged mail after heading."

 (provide 'org-mac-message)

-
-
 ;;; org-mac-message.el ends here
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -417,6 +416,4 @@ the value in cdr."

 (provide 'org-macs)

-
-
 ;;; org-macs.el ends here
--- a/lisp/org-mew.el
+++ b/lisp/org-mew.el
@ -5,7 +5,6 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7

 ;; This file is part of GNU Emacs.

@ -135,6 +134,4 @@

 (provide 'org-mew)

-
-
 ;;; org-mew.el ends here
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@ -5,7 +5,6 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -225,6 +224,4 @@ folders."

 (provide 'org-mhe)

-
-
 ;;; org-mhe.el ends here
--- a/lisp/org-mks.el
+++ b/lisp/org-mks.el
@ -5,7 +5,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -132,6 +131,4 @@ only the bare key is returned."

 (provide 'org-mks)

-
-
 ;;; org-mks.el ends here
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@ -4,7 +4,6 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -1099,7 +1098,5 @@ A and B must be strings or nil."

 (provide 'org-mobile)

-
-
 ;;; org-mobile.el ends here

--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@ -4,7 +4,7 @@
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 7.7
+
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@ -70,8 +70,7 @@
 ;;
 ;; Since version 5.10: Changes are listed in the general org-mode docs.
 ;;
-;; Version 5.09
-;; + Version number synchronization with Org-mode.
+;; Version 5.09;; + Version number synchronization with Org-mode.
 ;;
 ;; Version 0.25
 ;; + made compatible with org-mode 4.70 (thanks to Carsten for the patch)
@ -1146,6 +1145,4 @@ This means, between the beginning of line and the point."

 (provide 'org-mouse)

-
-
 ;;; org-mouse.el ends here
--- a/Show More
+++ b/Show More