contrib/lisp/*el: Fix license information and add "This file is not part..."

Also do some aesthetic code clean-up in org-drill.el.

contrib/lisp/htmlize.el

@@ -6,6 +6,8 @@
 ;; Keywords: hypermedia, extensions
 ;; Version: 1.43
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)

contrib/lisp/org-bibtex-extras.el

@@ -9,12 +9,12 @@
 
 ;; This file is not yet part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-bookmark.el

@@ -12,7 +12,7 @@
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-checklist.el

@@ -6,6 +6,8 @@
 ;; Version: 1.0
 ;; Keywords: org, checklists
 ;;
+;; This file is not part of GNU Emacs.
+;;
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
@@ -17,8 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

contrib/lisp/org-choose.el

@@ -1,7 +1,5 @@
-;;;_ org-choose.el --- decision management for org-mode
+;;; org-choose.el --- decision management for org-mode
 
-;;;_. Headers
-;;;_ , License
 ;; Copyright (C) 2009-2013 Tom Breton (Tehom)
 
 ;; This file is not part of GNU Emacs.
@@ -24,13 +22,13 @@
 ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;;;_ , Commentary:
+;;; Commentary:
 
-; This is code to support decision management.  It lets you treat a
-; group of sibling items in org-mode as alternatives in a decision.
+;; This is code to support decision management.  It lets you treat a
+;; group of sibling items in org-mode as alternatives in a decision.
 
-; There are no user commands in this file.  You use it by:
-;   * Loading it (manually or by M-x customize-apropos org-modules)
+;; There are no user commands in this file.  You use it by:
+;;   * Loading it (manually or by M-x customize-apropos org-modules)
 
 ;;   * Setting up at least one set of TODO keywords with the
 ;;     interpretation "choose" by either:
@@ -61,31 +59,30 @@
 ;;     * All the other TODO commands are available and behave essentially
 ;;       the normal way.
 
-
-;;;_ , Requires
+;;; Requires
 
 (require 'org)
-;(eval-when-compile
-;   (require 'cl))
+					;(eval-when-compile
+					;   (require 'cl))
 (require 'cl)
 
-;;;_. Body
-;;;_ , The variables
+;;; Body
+;;; The variables
 
 (defstruct (org-choose-mark-data. (:type list))
-   "The format of an entry in org-choose-mark-data.
+  "The format of an entry in org-choose-mark-data.
 Indexes are 0-based or `nil'.
 "
-   keyword
-   bot-lower-range
-   top-upper-range
-   range-length
-   static-default
-   all-keywords)
+  keyword
+  bot-lower-range
+  top-upper-range
+  range-length
+  static-default
+  all-keywords)
 
 (defvar org-choose-mark-data
-   ()
-   "Alist of information for choose marks.
+  ()
+  "Alist of information for choose marks.
 
 Each entry is an `org-choose-mark-data.'" )
 (make-variable-buffer-local 'org-choose-mark-data)
@@ -93,426 +90,394 @@ Each entry is an `org-choose-mark-data.'" )
 ;;;_  . org-choose-filter-one
 
 (defun org-choose-filter-one (i)
-   "Return a list of
+  "Return a list of
  * a canonized version of the string
  * optionally one symbol"
 
-   (if
+  (if
       (not
-	 (string-match "(.*)" i))
+       (string-match "(.*)" i))
       (list i i)
-      (let*
-	 (
-	    (end-text (match-beginning 0))
-	    (vanilla-text (substring i 0 end-text))
-	    ;;Get the parenthesized part.
-	    (match (match-string 0 i))
-	    ;;Remove the parentheses.
-	    (args (substring match 1 -1))
-	    ;;Split it
-	    (arglist
-	       (let
-		  ((arglist-x (org-split-string args ",")))
-		  ;;When string starts with "," `split-string' doesn't
-		  ;;make a first arg, so in that case make one
-		  ;;manually.
-		  (if
-		     (string-match "^," args)
-		     (cons nil arglist-x)
-		     arglist-x)))
-	    (decision-arg (second arglist))
-	    (type
-	       (cond
-		  ((string= decision-arg "0")
-		     'default-mark)
-		  ((string= decision-arg "+")
-		     'top-upper-range)
-		  ((string= decision-arg "-")
-		     'bot-lower-range)
-		  (t nil)))
-	    (vanilla-arg (first arglist))
-	    (vanilla-mark
-	       (if vanilla-arg
-		  (concat vanilla-text "("vanilla-arg")")
-		  vanilla-text)))
-	 (if type
-	    (list vanilla-text vanilla-mark type)
-	    (list vanilla-text vanilla-mark)))))
+    (let*
+	(
+	 (end-text (match-beginning 0))
+	 (vanilla-text (substring i 0 end-text))
+	 ;;Get the parenthesized part.
+	 (match (match-string 0 i))
+	 ;;Remove the parentheses.
+	 (args (substring match 1 -1))
+	 ;;Split it
+	 (arglist
+	  (let
+	      ((arglist-x (org-split-string args ",")))
+	    ;;When string starts with "," `split-string' doesn't
+	    ;;make a first arg, so in that case make one
+	    ;;manually.
+	    (if
+		(string-match "^," args)
+		(cons nil arglist-x)
+	      arglist-x)))
+	 (decision-arg (second arglist))
+	 (type
+	  (cond
+	   ((string= decision-arg "0")
+	    'default-mark)
+	   ((string= decision-arg "+")
+	    'top-upper-range)
+	   ((string= decision-arg "-")
+	    'bot-lower-range)
+	   (t nil)))
+	 (vanilla-arg (first arglist))
+	 (vanilla-mark
+	  (if vanilla-arg
+	      (concat vanilla-text "("vanilla-arg")")
+	    vanilla-text)))
+      (if type
+	  (list vanilla-text vanilla-mark type)
+	(list vanilla-text vanilla-mark)))))
 
 ;;;_  . org-choose-setup-vars
 (defun org-choose-setup-vars (bot-lower-range top-upper-range
-				   static-default num-items all-mark-texts)
-   "Add to org-choose-mark-data according to arguments"
-
-   (let*
-      (
-	 (tail
-	    ;;If there's no bot-lower-range or no default, we don't
-	    ;;have ranges.
-	    (cdr
-	       (if (and static-default bot-lower-range)
-		  (let*
-		     (
-			;;If there's no top-upper-range, use the last
-			;;item.
-			(top-upper-range
-			   (or top-upper-range (1- num-items)))
-			(lower-range-length
-			   (1+ (- static-default bot-lower-range)))
-			(upper-range-length
-			   (- top-upper-range static-default))
-			(range-length
-			   (min upper-range-length lower-range-length)))
-
-
-		     (make-org-choose-mark-data.
-			:keyword nil
-			:bot-lower-range bot-lower-range
-			:top-upper-range top-upper-range
-			:range-length    range-length
-			:static-default static-default
-			:all-keywords all-mark-texts))
-
-		  (make-org-choose-mark-data.
-		     :keyword nil
-		     :bot-lower-range nil
-		     :top-upper-range nil
-		     :range-length    nil
-		     :static-default (or static-default 0)
-		     :all-keywords all-mark-texts)))))
-
-      (dolist (text all-mark-texts)
-	 (pushnew (cons text tail)
-	    org-choose-mark-data
-	    :test
-	    #'(lambda (a b)
-		 (equal (car a) (car b)))))))
-
-
-
-
-;;;_  . org-choose-filter-tail
+					      static-default num-items all-mark-texts)
+  "Add to org-choose-mark-data according to arguments"
+  (let*
+      ((tail
+	;;If there's no bot-lower-range or no default, we don't
+	;;have ranges.
+	(cdr
+	 (if (and static-default bot-lower-range)
+	     (let*
+		 ;;If there's no top-upper-range, use the last
+		 ;;item.
+		 ((top-upper-range
+		   (or top-upper-range (1- num-items)))
+		  (lower-range-length
+		   (1+ (- static-default bot-lower-range)))
+		  (upper-range-length
+		   (- top-upper-range static-default))
+		  (range-length
+		   (min upper-range-length lower-range-length)))
+	       (make-org-choose-mark-data.
+		:keyword nil
+		:bot-lower-range bot-lower-range
+		:top-upper-range top-upper-range
+		:range-length    range-length
+		:static-default static-default
+		:all-keywords all-mark-texts))
+	   (make-org-choose-mark-data.
+	    :keyword nil
+	    :bot-lower-range nil
+	    :top-upper-range nil
+	    :range-length    nil
+	    :static-default (or static-default 0)
+	    :all-keywords all-mark-texts)))))
+    (dolist (text all-mark-texts)
+      (pushnew (cons text tail)
+	       org-choose-mark-data
+	       :test
+	       #'(lambda (a b)
+		   (equal (car a) (car b)))))))
+
+;;; org-choose-filter-tail
 (defun org-choose-filter-tail (raw)
-   "Return a translation of RAW to vanilla and set appropriate
+  "Return a translation of RAW to vanilla and set appropriate
 buffer-local variables.
 
 RAW is a list of strings representing the input text of a choose
 interpretation."
-   (let
+  (let
       ((vanilla-list nil)
-	 (all-mark-texts nil)
-	 (index 0)
-	 bot-lower-range top-upper-range range-length static-default)
-      (dolist (i raw)
-	 (destructuring-bind
-	    (vanilla-text vanilla-mark &optional type)
-	    (org-choose-filter-one i)
-	    (cond
-	       ((eq type 'bot-lower-range)
-		  (setq bot-lower-range index))
-	       ((eq type 'top-upper-range)
-		  (setq top-upper-range index))
-	       ((eq type 'default-mark)
-		  (setq static-default index)))
-	    (incf index)
-	    (push vanilla-text all-mark-texts)
-	    (push vanilla-mark vanilla-list)))
-
-      (org-choose-setup-vars bot-lower-range top-upper-range
-	 static-default index (reverse all-mark-texts))
-      (nreverse vanilla-list)))
-
-;;;_  . org-choose-setup-filter
+       (all-mark-texts nil)
+       (index 0)
+       bot-lower-range top-upper-range range-length static-default)
+    (dolist (i raw)
+      (destructuring-bind
+	  (vanilla-text vanilla-mark &optional type)
+	  (org-choose-filter-one i)
+	(cond
+	 ((eq type 'bot-lower-range)
+	  (setq bot-lower-range index))
+	 ((eq type 'top-upper-range)
+	  (setq top-upper-range index))
+	 ((eq type 'default-mark)
+	  (setq static-default index)))
+	(incf index)
+	(push vanilla-text all-mark-texts)
+	(push vanilla-mark vanilla-list)))
+
+    (org-choose-setup-vars bot-lower-range top-upper-range
+			   static-default index (reverse all-mark-texts))
+    (nreverse vanilla-list)))
+
+;;; org-choose-setup-filter
 
 (defun org-choose-setup-filter (raw)
-   "A setup filter for choose interpretations."
-   (when (eq (car raw) 'choose)
-      (cons
-	 'choose
-	 (org-choose-filter-tail (cdr raw)))))
+  "A setup filter for choose interpretations."
+  (when (eq (car raw) 'choose)
+    (cons
+     'choose
+     (org-choose-filter-tail (cdr raw)))))
 
-;;;_  . org-choose-conform-after-promotion
+;;; org-choose-conform-after-promotion
 (defun org-choose-conform-after-promotion (entry-pos keywords highest-ok-ix)
   "Conform the current item after another item was promoted"
-
-   (unless
+  (unless
       ;;Skip the entry that triggered this by skipping any entry with
       ;;the same starting position.  plist uses the start of the
       ;;header line as the position, but map no longer does, so we
       ;;have to go back to the heading.
       (=
-	 (save-excursion
-	    (org-back-to-heading)
-	    (point))
-	 entry-pos)
-      (let
-	 ((ix
-	     (org-choose-get-entry-index keywords)))
-	 ;;If the index of the entry exceeds the highest allowable
-	 ;;index, change it to that.
-	 (when (and ix
-		  (> ix highest-ok-ix))
-	    (org-todo
-	       (nth highest-ok-ix keywords))))))
+       (save-excursion
+	 (org-back-to-heading)
+	 (point))
+       entry-pos)
+    (let
+	((ix
+	  (org-choose-get-entry-index keywords)))
+      ;;If the index of the entry exceeds the highest allowable
+      ;;index, change it to that.
+      (when (and ix
+		 (> ix highest-ok-ix))
+	(org-todo
+	 (nth highest-ok-ix keywords))))))
 ;;;_  . org-choose-conform-after-demotion
 (defun org-choose-conform-after-demotion (entry-pos keywords
-					       raise-to-ix
-					       old-highest-ok-ix)
+						    raise-to-ix
+						    old-highest-ok-ix)
   "Conform the current item after another item was demoted."
-
-   (unless
+  (unless
       ;;Skip the entry that triggered this.
       (=
-	 (save-excursion
-	    (org-back-to-heading)
-	    (point))
-	 entry-pos)
-      (let
-	 ((ix
-	     (org-choose-get-entry-index keywords)))
-	 ;;If the index of the entry was at or above the old allowable
-	 ;;position, change it to the new mirror position if there is
-	 ;;one.
-	 (when (and
-		  ix
-		  raise-to-ix
-		  (>= ix old-highest-ok-ix))
-	    (org-todo
-	       (nth raise-to-ix keywords))))))
-
-;;;_ , org-choose-keep-sensible (the org-trigger-hook function)
+       (save-excursion
+	 (org-back-to-heading)
+	 (point))
+       entry-pos)
+    (let
+	((ix
+	  (org-choose-get-entry-index keywords)))
+      ;;If the index of the entry was at or above the old allowable
+      ;;position, change it to the new mirror position if there is
+      ;;one.
+      (when (and
+	     ix
+	     raise-to-ix
+	     (>= ix old-highest-ok-ix))
+	(org-todo
+	 (nth raise-to-ix keywords))))))
+
+;;; org-choose-keep-sensible (the org-trigger-hook function)
 (defun org-choose-keep-sensible (change-plist)
   "Bring the other items back into a sensible state after an item's
 setting was changed."
-   (let*
+  (let*
       (  (from (plist-get change-plist :from))
 	 (to (plist-get change-plist :to))
 	 (entry-pos
-	    (set-marker
-	       (make-marker)
-	       (plist-get change-plist :position)))
+	  (set-marker
+	   (make-marker)
+	   (plist-get change-plist :position)))
 	 (kwd-data
-	    (assoc to org-todo-kwd-alist)))
-      (when
-	 (eq (nth 1 kwd-data) 'choose)
-	 (let*
-	    (
-	       (data
-		  (assoc to org-choose-mark-data))
-	       (keywords
-		  (org-choose-mark-data.-all-keywords data))
-	       (old-index
-		  (org-choose-get-index-in-keywords
-		     from
-		     keywords))
-	       (new-index
-		  (org-choose-get-index-in-keywords
-		     to
-		     keywords))
-	       (highest-ok-ix
-		  (org-choose-highest-other-ok
-		     new-index
-		     data))
-	       (funcdata
-		  (cond
-		     ;;The entry doesn't participate in conformance,
-		     ;;so give `nil' which does nothing.
-		     ((not highest-ok-ix) nil)
-		     ;;The entry was created or promoted
-		     ((or
-			 (not old-index)
-			 (> new-index old-index))
-			(list
-			   #'org-choose-conform-after-promotion
-			   entry-pos keywords
-			   highest-ok-ix))
-		     (t	;;Otherwise the entry was demoted.
-			(let
-			   (
-			      (raise-to-ix
-				 (min
-				    highest-ok-ix
-				    (org-choose-mark-data.-static-default
-				       data)))
-			      (old-highest-ok-ix
-				 (org-choose-highest-other-ok
-				    old-index
-				    data)))
-
-			   (list
-			      #'org-choose-conform-after-demotion
-			      entry-pos
-			      keywords
-			      raise-to-ix
-			      old-highest-ok-ix))))))
-
-	    (if funcdata
-	       ;;The funny-looking names are to make variable capture
-	       ;;unlikely.  (Poor-man's lexical bindings).
-	       (destructuring-bind (func-d473 . args-46k) funcdata
-		  (let
-		     ((map-over-entries
-			 (org-choose-get-fn-map-group))
-			;;We may call `org-todo', so let various hooks
-			;;`nil' so we don't cause loops.
-			org-after-todo-state-change-hook
-			org-trigger-hook
-			org-blocker-hook
-			org-todo-get-default-hook
-			;;Also let this alist `nil' so we don't log
-			;;secondary transitions.
-			org-todo-log-states)
-		     ;;Map over group
-		     (funcall map-over-entries
-			#'(lambda ()
+	  (assoc to org-todo-kwd-alist)))
+    (when
+	(eq (nth 1 kwd-data) 'choose)
+      (let*
+	  (
+	   (data
+	    (assoc to org-choose-mark-data))
+	   (keywords
+	    (org-choose-mark-data.-all-keywords data))
+	   (old-index
+	    (org-choose-get-index-in-keywords
+	     from
+	     keywords))
+	   (new-index
+	    (org-choose-get-index-in-keywords
+	     to
+	     keywords))
+	   (highest-ok-ix
+	    (org-choose-highest-other-ok
+	     new-index
+	     data))
+	   (funcdata
+	    (cond
+	     ;;The entry doesn't participate in conformance,
+	     ;;so give `nil' which does nothing.
+	     ((not highest-ok-ix) nil)
+	     ;;The entry was created or promoted
+	     ((or
+	       (not old-index)
+	       (> new-index old-index))
+	      (list
+	       #'org-choose-conform-after-promotion
+	       entry-pos keywords
+	       highest-ok-ix))
+	     (t	;;Otherwise the entry was demoted.
+	      (let
+		  (
+		   (raise-to-ix
+		    (min
+		     highest-ok-ix
+		     (org-choose-mark-data.-static-default
+		      data)))
+		   (old-highest-ok-ix
+		    (org-choose-highest-other-ok
+		     old-index
+		     data)))
+		(list
+		 #'org-choose-conform-after-demotion
+		 entry-pos
+		 keywords
+		 raise-to-ix
+		 old-highest-ok-ix))))))
+	(if funcdata
+	    ;;The funny-looking names are to make variable capture
+	    ;;unlikely.  (Poor-man's lexical bindings).
+	    (destructuring-bind (func-d473 . args-46k) funcdata
+	      (let
+		  ((map-over-entries
+		    (org-choose-get-fn-map-group))
+		   ;;We may call `org-todo', so let various hooks
+		   ;;`nil' so we don't cause loops.
+		   org-after-todo-state-change-hook
+		   org-trigger-hook
+		   org-blocker-hook
+		   org-todo-get-default-hook
+		   ;;Also let this alist `nil' so we don't log
+		   ;;secondary transitions.
+		   org-todo-log-states)
+		;;Map over group
+		(funcall map-over-entries
+			 #'(lambda ()
 			     (apply func-d473 args-46k))))))))
+    ;;Remove the marker
+    (set-marker entry-pos nil)))
 
-      ;;Remove the marker
-      (set-marker entry-pos nil)))
-
-
-
-;;;_ , Getting the default mark
-;;;_  . org-choose-get-index-in-keywords
+;;; Getting the default mark
+;;; org-choose-get-index-in-keywords
 (defun org-choose-get-index-in-keywords (ix all-keywords)
   "Return the index of the current entry."
-
-   (if ix
+  (if ix
       (position ix all-keywords
-	 :test #'equal)))
+		:test #'equal)))
 
-;;;_  . org-choose-get-entry-index
+;;; org-choose-get-entry-index
 (defun org-choose-get-entry-index (all-keywords)
-   "Return index of current entry."
-
-   (let*
+  "Return index of current entry."
+  (let*
       ((state (org-entry-get (point) "TODO")))
-      (org-choose-get-index-in-keywords state all-keywords)))
+    (org-choose-get-index-in-keywords state all-keywords)))
 
-;;;_  . org-choose-get-fn-map-group
+;;; org-choose-get-fn-map-group
 
 (defun org-choose-get-fn-map-group ()
-   "Return a function to map over the group"
-
-   #'(lambda (fn)
-       (require 'org-agenda) ;; `org-map-entries' seems to need it.
-	(save-excursion
-	  (unless (org-up-heading-safe)
-	    (error "Choosing is only supported between siblings in a tree, not on top level"))
-	  (let
- 	      ((level (org-reduced-level (org-outline-level))))
-	    (save-restriction
-	      (org-map-entries
-	       fn
-	       (format "LEVEL=%d" level)
-	       'tree))))))
-
-;;;_  . org-choose-get-highest-mark-index
+  "Return a function to map over the group"
+  #'(lambda (fn)
+      (require 'org-agenda) ;; `org-map-entries' seems to need it.
+      (save-excursion
+	(unless (org-up-heading-safe)
+	  (error "Choosing is only supported between siblings in a tree, not on top level"))
+	(let
+	    ((level (org-reduced-level (org-outline-level))))
+	  (save-restriction
+	    (org-map-entries
+	     fn
+	     (format "LEVEL=%d" level)
+	     'tree))))))
+
+;;; org-choose-get-highest-mark-index
 
 (defun org-choose-get-highest-mark-index (keywords)
-   "Get the index of the highest current mark in the group.
+  "Get the index of the highest current mark in the group.
 If there is none, return 0"
-
-   (let*
-      (
-	 ;;Func maps over applicable entries.
-	 (map-over-entries
-	    (org-choose-get-fn-map-group))
-
-	 (indexes-list
-	    (remove nil
-	       (funcall map-over-entries
-		  #'(lambda ()
-		       (org-choose-get-entry-index keywords))))))
-      (if
-	 indexes-list
-	 (apply #'max indexes-list)
-	 0)))
-
-
-;;;_  . org-choose-highest-ok
+  (let*
+      ;;Func maps over applicable entries.
+      ((map-over-entries
+	(org-choose-get-fn-map-group))
+       (indexes-list
+	(remove nil
+		(funcall map-over-entries
+			 #'(lambda ()
+			     (org-choose-get-entry-index keywords))))))
+    (if
+	indexes-list
+	(apply #'max indexes-list)
+      0)))
+
+;;; org-choose-highest-ok
 
 (defun org-choose-highest-other-ok (ix data)
   "Return the highest index that any choose mark can sensibly have,
 given that another mark has index IX.
 DATA must be a `org-choose-mark-data.'."
+  (let
+      ((bot-lower-range
+	(org-choose-mark-data.-bot-lower-range data))
+       (top-upper-range
+	(org-choose-mark-data.-top-upper-range data))
+       (range-length
+	(org-choose-mark-data.-range-length data)))
+    (when (and ix bot-lower-range)
+      (let*
+	  ((delta
+	    (- top-upper-range ix)))
+	(unless
+	    (< range-length delta)
+	  (+ bot-lower-range delta))))))
 
-   (let
-      (
-	 (bot-lower-range
-	    (org-choose-mark-data.-bot-lower-range data))
-	 (top-upper-range
-	    (org-choose-mark-data.-top-upper-range data))
-	 (range-length
-	    (org-choose-mark-data.-range-length data)))
-      (when (and ix bot-lower-range)
-	 (let*
-	    ((delta
-		(- top-upper-range ix)))
-	    (unless
-	       (< range-length delta)
-	       (+ bot-lower-range delta))))))
-
-;;;_  . org-choose-get-default-mark-index
+;;; org-choose-get-default-mark-index
 
 (defun org-choose-get-default-mark-index (data)
   "Return the index of the default mark in a choose interpretation.
 
 DATA must be a `org-choose-mark-data.'."
-
-
-   (or
-      (let
-	 ((highest-mark-index
-	     (org-choose-get-highest-mark-index
-		(org-choose-mark-data.-all-keywords data))))
-	 (org-choose-highest-other-ok
-	    highest-mark-index data))
-      (org-choose-mark-data.-static-default data)))
-
-
-
-;;;_  . org-choose-get-mark-N
+  (or
+   (let
+       ((highest-mark-index
+	 (org-choose-get-highest-mark-index
+	  (org-choose-mark-data.-all-keywords data))))
+     (org-choose-highest-other-ok
+      highest-mark-index data))
+   (org-choose-mark-data.-static-default data)))
+
+;;; org-choose-get-mark-N
 (defun org-choose-get-mark-N (n data)
-   "Get the text of the nth mark in a choose interpretation."
+  "Get the text of the nth mark in a choose interpretation."
 
-   (let*
+  (let*
       ((l (org-choose-mark-data.-all-keywords data)))
-      (nth n l)))
+    (nth n l)))
 
-;;;_  . org-choose-get-default-mark
+;;; org-choose-get-default-mark
 
 (defun org-choose-get-default-mark (new-mark old-mark)
-   "Get the default mark IFF in a choose interpretation.
+  "Get the default mark IFF in a choose interpretation.
 NEW-MARK and OLD-MARK are the text of the new and old marks."
-
-   (let*
-      (
-	 (old-kwd-data
-	    (assoc old-mark org-todo-kwd-alist))
-	 (new-kwd-data
-	    (assoc new-mark org-todo-kwd-alist))
-	 (becomes-choose
-	    (and
-	       (or
-		  (not old-kwd-data)
-		  (not
-		     (eq (nth 1 old-kwd-data) 'choose)))
-	       (eq (nth 1 new-kwd-data) 'choose))))
-      (when
-	 becomes-choose
-	 (let
-	    ((new-mark-data
-		(assoc new-mark org-choose-mark-data)))
-	    (if
-	       new-mark
-	       (org-choose-get-mark-N
-		  (org-choose-get-default-mark-index
-		     new-mark-data)
-		  new-mark-data)
-	       (error "Somehow got an unrecognizable mark"))))))
-
-;;;_ , Setting it all up
+  (let*
+      ((old-kwd-data
+	(assoc old-mark org-todo-kwd-alist))
+       (new-kwd-data
+	(assoc new-mark org-todo-kwd-alist))
+       (becomes-choose
+	(and
+	 (or
+	  (not old-kwd-data)
+	  (not
+	   (eq (nth 1 old-kwd-data) 'choose)))
+	 (eq (nth 1 new-kwd-data) 'choose))))
+    (when
+	becomes-choose
+      (let
+	  ((new-mark-data
+	    (assoc new-mark org-choose-mark-data)))
+	(if
+	    new-mark
+	    (org-choose-get-mark-N
+	     (org-choose-get-default-mark-index
+	      new-mark-data)
+	     new-mark-data)
+	  (error "Somehow got an unrecognizable mark"))))))
+
+;;; Setting it all up
 
 (eval-after-load "org"
   '(progn
@@ -524,19 +489,8 @@ NEW-MARK and OLD-MARK are the text of the new and old marks."
 		  #'org-choose-keep-sensible)
      (add-to-list 'org-todo-interpretation-widgets
 		  '(:tag "Choose   (to record decisions)" choose)
-		  'append)
-     ))
-
-
-;;;_. Footers
-;;;_ , Provides
+		  'append)))
 
 (provide 'org-choose)
 
-;;;_ * Local emacs vars.
-;;;_  + Local variables:
-;;;_  + End:
-
-;;;_ , End
-
 ;;; org-choose.el ends here

contrib/lisp/org-collector.el

@@ -10,12 +10,12 @@
 
 ;; This file is not yet part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-colview-xemacs.el

@@ -9,18 +9,19 @@
 ;;
 ;; This file is part of Org mode, it is not part of GNU Emacs.
 ;;
-;; You can redistribute it and/or modify it under the terms of the
-;; GNU General Public License as published by the Free Software
-;; Foundation; either version 3, or (at your option) any later
-;; version.
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this file; see the file COPYING.
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-contacts.el

@@ -7,12 +7,12 @@
 ;;
 ;; This file is NOT part of GNU Emacs.
 ;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-contribdir.el

@@ -8,12 +8,12 @@
 ;;
 ;; This file is not yet part of GNU Emacs.
 ;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-depend.el

@@ -13,15 +13,13 @@
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-elisp-symbol.el

@@ -20,8 +20,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;

contrib/lisp/org-eval-light.el

@@ -11,20 +11,18 @@
 
 ;; This file is not yet part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

contrib/lisp/org-eval.el

@@ -8,20 +8,18 @@
 ;;
 ;; This file is not yet part of GNU Emacs.
 ;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-expiry.el

@@ -19,8 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;

contrib/lisp/org-favtable.el

@@ -23,9 +23,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

contrib/lisp/org-git-link.el

@@ -5,6 +5,8 @@
 ;; Author: Reimar Finken <reimar.finken@gmx.de>
 ;; Keywords: files, calendar, hypermedia
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or

contrib/lisp/org-interactive-query.el

@@ -19,8 +19,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;

contrib/lisp/org-invoice.el

@@ -23,7 +23,7 @@
 ;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 ;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ;;
-;; Commentary:
+;;; Commentary:
 ;;
 ;; Building on top of the terrific OrgMode, org-invoice tries to
 ;; provide functionality for managing invoices.  Currently, it does

contrib/lisp/org-jira.el

@@ -14,9 +14,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 
-;; For a copy of the GNU General Public License, search the Internet,
-;; or write to the Free Software Foundation, Inc., 59 Temple Place,
-;; Suite 330, Boston, MA 02111-1307 USA
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; This adds a jira protocol to org mode.

contrib/lisp/org-learn.el

@@ -9,12 +9,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-mac-iCal.el

@@ -3,24 +3,23 @@
 ;; Copyright (C) 2009-2013 Christopher Suckling
 
 ;; Author: Christopher Suckling <suckling at gmail dot com>
+;; Version: 0.1057.104
+;; Keywords: outlines, calendar
+
+;; This file is not part of GNU Emacs.
 
-;; This file is Free Software; you can redistribute it and/or modify
+;; This program is Free Software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; It is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+;; for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;; Version: 0.1057.104
-;; Keywords: outlines, calendar
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;

contrib/lisp/org-mac-link-grabber.el

@@ -1,5 +1,5 @@
 ;;; org-mac-link-grabber.el --- Grab links and url from various mac
-;;; application and insert them as links into org-mode documents
+;; Application and insert them as links into org-mode documents
 ;;
 ;; Copyright (c) 2010-2013 Free Software Foundation, Inc.
 ;;
@@ -20,8 +20,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;; Commentary:
 ;;

contrib/lisp/org-mairix.el

@@ -3,6 +3,8 @@
 ;; Copyright (C) 2007-2013 Georg C. F. Greve
 ;; mutt support by Adam Spiers <orgmode at adamspiers dot org>
 ;;
+;; This file is not part of GNU Emacs.
+;;
 ;; Author: Georg C. F. Greve <greve at fsfeurope dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp, email, mairix
 ;; Purpose: Integrate mairix email searching into Org mode
@@ -20,9 +22,7 @@
 ;; License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; USAGE NOTE
 ;;

contrib/lisp/org-man.el

@@ -7,20 +7,18 @@
 ;;
 ;; This file is not yet part of GNU Emacs.
 ;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-mew.el

@@ -8,12 +8,12 @@
 
 ;; This file is not part of GNU Emacs.
 
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-mime.el

@@ -22,9 +22,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

contrib/lisp/org-mtags.el

@@ -9,20 +9,18 @@
 ;;
 ;; This file is not yet part of GNU Emacs.
 ;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-notify.el

@@ -5,6 +5,8 @@
 ;; Author: Peter Münster <pmrb@free.fr>
 ;; Keywords: notification, todo-list, alarm, reminder, pop-up
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or

contrib/lisp/org-notmuch.el

@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

contrib/lisp/org-panel.el

@@ -50,9 +50,7 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;

contrib/lisp/org-registry.el

@@ -11,6 +11,8 @@
 ;; Description: Shows Org files where the current buffer is linked
 ;; URL: http://www.cognition.ens.fr/~guerry/u/org-registry.el
 ;;
+;; This file is not part of GNU Emacs.
+;;
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
@@ -22,8 +24,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;

contrib/lisp/org-screen.el

@@ -7,20 +7,18 @@
 ;;
 ;; This file is not yet part of GNU Emacs.
 ;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-secretary.el

@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-static-mathjax.el

@@ -2,6 +2,22 @@
 ;;
 ;; Author: Jan Böker <jan dot boecker at jboecker dot de>
 
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
 ;; This elisp code integrates Static MathJax into the
 ;; HTML export process of Org-mode.
 ;;
@@ -39,7 +55,7 @@
 ;; of your math, add the following line at the top of your Org file:
 ;; -*- coding: utf-8; -*-
 ;;
-;; License: GPL v2 or later
+;;; Code:
 
 (defcustom org-static-mathjax-app-ini-path
   (or (expand-file-name

contrib/lisp/org-sudoku.el

@@ -9,20 +9,18 @@
 ;;
 ;; This file is not yet part of GNU Emacs.
 ;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;;; Commentary:

contrib/lisp/org-toc.el

@@ -20,8 +20,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

contrib/lisp/org-track.el

@@ -16,12 +16,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-velocity.el

@@ -17,9 +17,8 @@
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 
-;; For a copy of the GNU General Public License, search the Internet,
-;; or write to the Free Software Foundation, Inc., 59 Temple Place,
-;; Suite 330, Boston, MA 02111-1307 USA
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;; Org-Velocity.el is an interface for Org inspired by the minimalist

contrib/lisp/org-vm.el

@@ -12,12 +12,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-w3m.el

@@ -8,12 +8,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-wikinodes.el

@@ -9,12 +9,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/org-wl.el

@@ -9,12 +9,12 @@
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/orgtbl-sqlinsert.el

@@ -5,6 +5,8 @@
 ;; Author: Jason Riedy <jason@acm.org>
 ;; Keywords: org, tables, sql
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or

contrib/lisp/ox-confluence.el

@@ -7,12 +7,12 @@
 
 ;; This file is not part of GNU Emacs.
 
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/ox-deck.el

@@ -5,6 +5,8 @@
 ;; Author: Rick Frankel <emacs at rickster dot com>
 ;; Keywords: outlines, hypermedia, slideshow
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or

contrib/lisp/ox-freemind.el

@@ -5,12 +5,14 @@
 ;; Author: Jambunathan K <kjambunathan at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/ox-groff.el

@@ -6,6 +6,8 @@
 ;; Author: Luis R Anaya <papoanaya aroba hot mail punto com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or

contrib/lisp/ox-koma-letter.el

@@ -6,12 +6,12 @@
 ;;         Alan Schmitt <alan.schmitt AT polytechnique DOT org>
 ;; Keywords: org, wp, tex
 
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

contrib/lisp/ox-s5.el

@@ -5,6 +5,8 @@
 ;; Author: Rick Frankel <emacs at rickster dot com>
 ;; Keywords: outlines, hypermedia, S5, wp
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or

contrib/lisp/ox-taskjuggler.el

@@ -10,6 +10,8 @@
 ;; Keywords: org, taskjuggler, project planning
 ;; Description: Converts an Org mode buffer into a TaskJuggler project plan
 
+;; This file is not part of GNU Emacs.
+
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -23,7 +25,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Commentary:
+;;; Commentary:
 ;;
 ;; This library implements a TaskJuggler exporter for Org mode.
 ;; TaskJuggler uses a text format to define projects, tasks and