2008-11-24 Carsten Dominik <carsten.dominik@gmail.com>

	* org-agenda.el (org-get-closed): Re-apply changes
	accidentially overwritten by last commit to Emacs.

	* org.el (org-outline-path-complete-in-steps): New option.
	(org-refile-get-location): Honor
	`org-outline-path-complete-in-steps'.
	(org-agenda-change-all-lines, org-tags-sparse-tree)
	(org-time-string-to-absolute, org-small-year-to-year)
	(org-link-escape): Re-apply changes accidentially overwritten
	by last commit to Emacs.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ec9a85a59741b5f8acf8e9535b68a6a782bb7c0d..1b635720f0aa5b09628adbb5e4a42deb389de2be 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-24  Carsten Dominik  <dominik@science.uva.nl>
+
+       * org.texi: re-apply change to FDL 1.3.
+
 2008-11-23  Carsten Dominik  <dominik@science.uva.nl>
 
        * org.texi (Setting up Remember): Document `org-remember-mode'.

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index faac6b953311af1050a2885c14f96406f76d38fd..8f2620ad5db0d281d1492b404727091d5ad153d9 100644 (file)
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.13
+@set VERSION 6.13a
 @set DATE November 2008
 
 @dircategory Emacs
@@ -39,7 +39,7 @@ Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 Free Software Foundation
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
 and with the Back-Cover Texts as in (a) below.  A copy of the license
@@ -868,6 +868,7 @@ u            @r{One level up.}
 0-9          @r{Digit argument.}
 q            @r{Quit}
 @end example
+See also the variable@code{org-goto-interface}.
 @end table
 
 @node Structure editing, Archiving, Motion, Document Structure
@@ -5206,13 +5207,14 @@ special command:
 Refile the entry or region at point.  This command offers possible locations
 for refiling the entry and lets you select one with completion.  The item (or
 all items in the region) is filed below the target heading as a subitem.
-Depending on @code{org-reverse-note-order}, it will be either the first of
+Depending on @code{org-reverse-note-order}, it will be either the first or
 last subitem.@*
 By default, all level 1 headlines in the current buffer are considered to be
 targets, but you can have more complex definitions across a number of files.
 See the variable @code{org-refile-targets} for details.  If you would like to
-select a location via a file-pathlike completion along the outline path, see
-the variable @code{org-refile-use-outline-path}.
+select a location via a file-path-like completion along the outline path, see
+the variables @code{org-refile-use-outline-path} and
+@code{org-outline-path-complete-in-steps}.
 @kindex C-u C-c C-w
 @item C-u C-c C-w
 Use the refile interface to jump to a heading.
@@ -8990,7 +8992,7 @@ go to @url{http://orgmode.org} to get access to these modules.
       exactly point to the definition location of a variable of function.
 @item @file{org-eval.el} by @i{Carsten Dominik}
       The @code{<lisp>} tag, adapted from Emacs Wiki and Emacs Muse, allows
-      to include text in a document that is the result of evaluating some
+      text to be included in a document that is the result of evaluating some
       code.  Other scripting languages like @code{perl} can be supported with
       this package as well.
 @item @file{org-eval-light.el} by @i{Eric Schulte}

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 0988066eb68b1de6239e010ebbca684f7acf8606..743e38041bf31a15e3a93d2225fba83327809f09 100644 (file)
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -3398,7 +3398,7 @@ the documentation of `org-diary'."
          (push txt ee))))
     (nreverse ee)))
 
-(defalias 'org-get-closed 'org-get-progress)
+(defalias 'org-get-closed 'org-agenda-get-progress)
 (defun org-agenda-get-progress ()
   "Return the logged TODO entries for agenda display."
   (let* ((props (list 'mouse-face 'highlight

diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 547fee259a9ddfa8d9ee6928205e88d634fb78d9..aee8b5f795ad73fb1fa31053679c7843058680d1 100644 (file)
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 539de7f5b12ac6fbcaa2606283e229f151239ee3..d48c0bde639a236d36bce455f89a49fcdc0de325 100644 (file)
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -4,7 +4,7 @@
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
-;; Version: 6.13
+;; Version: 6.13a
 
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index ca2fe1393442a9c2e354a4f604b7da492cd23980..c675cc2f4be3f13f53107ffba79429776598b00d 100644 (file)
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -6,7 +6,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index d2e975ed8c0082bce8a899b551cf9132c4d9c8b9..215ba40ce6601fbf68ffa371f25179aa07a5768b 100644 (file)
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 82064e0cdb02061c56976ad70e3dbc9ccafcf191..3848fac7bf46bbfdc59c5ddcf2b3fff1a46ca0db 100644 (file)
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 3daef2a0f2f705f7262368c1fbf68f7919ec086c..2072cebe5326058a710d7ce510a4ec82d2c40264 100644 (file)
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index f3707cdd4f8a541c8508a9ec816fd2eee2255891..ebfa203188ee6815c4ecf00048d54908af76e80a 100644 (file)
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index dfe9f8a4f7cd0081359680b3ace304086703e596..2a0e46deb11caa354501eb7df0a478ba949137bc 100644 (file)
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-export-latex.el b/lisp/org/org-export-latex.el
index 09ada3e451d222006395c9bb89725775549d67f3..be7d5e44ed4edd8e2126239b566f9383db846cc7 100644 (file)
--- a/lisp/org/org-export-latex.el
+++ b/lisp/org/org-export-latex.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-export-latex.el
-;; Version: 6.13
+;; Version: 6.13a
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: org, wp, tex

diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 6cf4db4df677cfd24c07cf06b1fe26816d261527..2ddcb9ee41676a43adb3a04b34d8638db61d445e 100644 (file)
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index 1d707dc7b1fa400212dd8e8e1f4234e27942685f..8cc11f1eefaa2986181df81c9989daa904f12947 100644 (file)
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -6,7 +6,7 @@
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 64f139c5f19741d411b616b7e5e158e33ace5a55..8fa5ff15ea587b3d40b4e2ae274543eafce487a3 100644 (file)
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -4,7 +4,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index c040ba6f87f076d072d08b444985fe507b9eb384..5891d70b12256136638ef6dd57d9e18351195cf5 100644 (file)
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index 4d35ef3dd989b28901b53eda9f183f2e2c84a169..8527d4a0a88250d13fcf4ec5565ab59e684eed5c 100644 (file)
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index f1bb3ef7ed15ef134875c4652eaf2b1f6951e9fc..e8221f7fed3a947bbb8923286e4cab093fa63f5a 100644 (file)
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index a2990743a577c04d0ff696af1dc53992d483cd69..d554cb125623d5c5ec3b5d937b5f15c5a560b8df 100644 (file)
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -6,7 +6,7 @@
 ;;         Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index 2f9e63bed8a39a15a2aebb5a3edd34ef00e93d1f..f0d6229e7bd14e0a3b92a9a299f01c574464bd63 100644 (file)
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Version: 6.13
+;; Version: 6.13a
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; This file is part of GNU Emacs.

diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 563f6c3e33d549746c16874b33465f6b0c7fe107..0950b6d63a8d312964bcf73c8e4d61ad6a73c7d0 100644 (file)
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-mew.el b/lisp/org/org-mew.el
index fda6270016d876ae169f93a86a33ee50facc2a2b..61bfc2fc5c55b0a28cc50b46ed0fdcf5719f04cc 100644 (file)
--- a/lisp/org/org-mew.el
+++ b/lisp/org/org-mew.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index ab9f797cb8177348534380cffe9e17487377a67a..c51b60e6a26d411935313416f8fd60e235a74833 100644 (file)
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -5,7 +5,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 0cb650581634b39023f2fe9b87423a97a8d7460c..7ec3bbe7afab01ac2bc595945d39067b93d8b52b 100644 (file)
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/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: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -144,7 +144,7 @@
 (defvar org-agenda-undo-list)
 (defvar org-agenda-custom-commands)
 (declare-function org-agenda-change-all-lines "org-agenda"
-                 (newhead hdmarker &optional fixface))
+                 (newhead hdmarker &optional fixface just-this))
 (declare-function org-verify-change-for-undo "org-agenda" (l1 l2))
 
 (defvar org-mouse-plain-list-regexp "\\([ \t]*\\)\\([-+*]\\|[0-9]+[.)]\\) "

diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index b2443ccd7e9fdefc09ac8a32a54e22a3973f6546..491035b7900139af3d0a56749836350389de747d 100644 (file)
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index eafa8faab63a833f4bfd559dbabf09dff22e6189..6e3d1af85dc4a701a890875a9510082b753120da 100644 (file)
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -4,7 +4,7 @@
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: hypermedia, outlines, wp
-;; Version: 6.13
+;; Version: 6.13a
 
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index ce3f5479eaaf5ccdfb01c3935632dae0382316f2..d9c2dd4cadfabfd907c937950d3d9c425523a7e4 100644 (file)
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index 4782f50eacedd9d9969c3c4d5d929b94f4e9413d..f6f9e791c03159bc8ca3bf96094f25e6cb36c56e 100644 (file)
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 0797d1b13243d682e00c75f210069364866e7783..5e8442cc22487f8764f83be2ec955a4c4e135136 100644 (file)
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index 2394591ffd09a79ee9f18131b4a746547dd455d7..fb82ee469608146f996739af85f97d8fffa32ea0 100644 (file)
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index e07bc82c063ed18084e222d27341879688b82e28..0483e3c0d384f9a6decfd227c3815b856da12eff 100644 (file)
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org.el b/lisp/org/org.el
index d25d9c5cf5e5e9f9c695124805553be4cf966d70..340737be9396b14badb6a3dab01f5878e6ad03c7 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.13
+;; Version: 6.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -92,7 +92,7 @@
 
 ;;; Version
 
-(defconst org-version "6.13"
+(defconst org-version "6.13a"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)
@@ -1245,7 +1245,7 @@ For more examples, see the system specific constants
 
 (defgroup org-refile nil
   "Options concerning refiling entries in Org-mode."
-  :tag "Org Remember"
+  :tag "Org Refile"
   :group 'org)
 
 (defcustom org-directory "~/org"
@@ -1275,7 +1275,8 @@ outline                  The interface shows an outline of the relevant file
                          and the correct heading is found by moving through
                          the outline or by searching with incremental search.
 outline-path-completion  Headlines in the current buffer are offered via
-                         completion."
+                         completion.  This is the interface also used by
+                         the refile command."
   :group 'org-refile
   :type '(choice
          (const :tag "Outline" outline)
@@ -1287,6 +1288,7 @@ When nil, new notes will be filed to the end of a file or entry.
 This can also be a list with cons cells of regular expressions that
 are matched against file names, and values."
   :group 'org-remember
+  :group 'org-refile
   :type '(choice
          (const :tag "Reverse always" t)
          (const :tag "Reverse never" nil)
@@ -1314,7 +1316,7 @@ This is list of cons cells.  Each cell contains:
 
 When this variable is nil, all top-level headlines in the current buffer
 are used, equivalent to the value `((nil . (:level . 1))'."
-  :group 'org-remember
+  :group 'org-refile
   :type '(repeat
          (cons
           (choice :value org-agenda-files
@@ -1333,13 +1335,25 @@ are used, equivalent to the value `((nil . (:level . 1))'."
 So a level 3 headline will be available as level1/level2/level3.
 When the value is `file', also include the file name (without directory)
 into the path.  When `full-file-path', include the full file path."
-  :group 'org-remember
+  :group 'org-refile
   :type '(choice
          (const :tag "Not" nil)
          (const :tag "Yes" t)
          (const :tag "Start with file name" file)
          (const :tag "Start with full file path" full-file-path)))
 
+(defcustom org-outline-path-complete-in-steps t
+  "Non-nil means, complete the outline path in hierarchical steps.
+When Org-mode uses the refile interface to select an outline path
+\(see variable `org-refile-use-outline-path'), the completion of
+the path can be done is a single go, or if can be done in steps down
+the headline hierarchy.  Going in steps is probably the best if you
+do not use a special completion package like `ido' or `icicles'.
+However, when using these packages, going in one step can be very
+fast, while still showing the whole path to the entry."
+  :group 'org-refile
+  :type 'boolean)
+
 (defgroup org-todo nil
   "Options concerning TODO items in Org-mode."
   :tag "Org TODO"
@@ -2381,7 +2395,7 @@ Normal means, no org-mode-specific context."
                  (extra txt &optional category tags dotime noprefix remove-re))
 (declare-function org-agenda-new-marker "org-agenda" (&optional pos))
 (declare-function org-agenda-change-all-lines "org-agenda"
-                 (newhead hdmarker &optional fixface))
+                 (newhead hdmarker &optional fixface just-this))
 (declare-function org-agenda-set-restriction-lock "org-agenda" (&optional type))
 (declare-function org-agenda-maybe-redo "org-agenda" ())
 (declare-function org-agenda-save-markers-for-cut-and-paste "org-agenda"
@@ -6326,7 +6340,7 @@ This is the list that is used for internal purposes.")
 This is the list that is used before handing over to the browser.")
 
 (defun org-link-escape (text &optional table)
-  "Escape charaters in TEXT that are problematic for links."
+  "Escape characters in TEXT that are problematic for links."
   (setq table (or table org-link-escape-chars))
   (when text
     (let ((re (mapconcat (lambda (x) (regexp-quote
@@ -7504,7 +7518,8 @@ operation has put the subtree."
   (unless org-refile-target-table
     (error "No refile targets"))
   (let* ((cbuf (current-buffer))
-        (cfunc (if org-refile-use-outline-path
+        (cfunc (if (and org-refile-use-outline-path
+                        org-outline-path-complete-in-steps)
                    'org-olpath-completing-read
                  'org-ido-completing-read))
         (extra (if org-refile-use-outline-path "/" ""))
@@ -9082,10 +9097,10 @@ only lines with a TODO keyword are included in the output."
 (defvar todo-only) ;; dynamically scoped
 
 (defun org-tags-sparse-tree (&optional todo-only match)
-  "Create a sparse tree according to tags  string MATCH.
+  "Create a sparse tree according to tags string MATCH.
 MATCH can contain positive and negative selection of tags, like
 \"+WORK+URGENT-WITHBOSS\".
-If optional argument TODO_ONLY is non-nil, only select lines that are
+If optional argument TODO-ONLY is non-nil, only select lines that are
 also TODO lines."
   (interactive "P")
   (org-prepare-agenda-buffers (list (current-buffer)))
@@ -11228,7 +11243,7 @@ days in order to avoid rounding problems."
   "Convert a time stamp to an absolute day number.
 If there is a specifyer for a cyclic time stamp, get the closest date to
 DAYNR.
-PREFER and SHOW_ALL are passed through to `org-closest-date'."
+PREFER and SHOW-ALL are passed through to `org-closest-date'."
   (cond
    ((and daynr (string-match "\\`%%\\((.*)\\)" s))
     (if (org-diary-sexp-entry (match-string 1 s) "" date)
@@ -11248,8 +11263,8 @@ PREFER and SHOW_ALL are passed through to `org-closest-date'."
 (defun org-small-year-to-year (year)
   "Convert 2-digit years into 4-digit years.
 38-99 are mapped into 1938-1999.  1-37 are mapped into 2001-2007.
-The year 2000 cannot be abbreviated.  Any year lager than 99
-is retrned unchanged."
+The year 2000 cannot be abbreviated.  Any year larger than 99
+is returned unchanged."
   (if (< year 38)
       (setq year (+ 2000 year))
     (if (< year 100)