diff options
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/org/org-list.el | 2 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index f6bd1ffa2d4..704da5fa68e 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -5020,7 +5020,7 @@ | |||
| 5020 | with code implementing the writing of graohical output to file. | 5020 | with code implementing the writing of graohical output to file. |
| 5021 | (org-babel-execute:R): Use `org-babel-R-graphical-output-file' to | 5021 | (org-babel-execute:R): Use `org-babel-R-graphical-output-file' to |
| 5022 | determine whether R is taking responsibility for writing output to | 5022 | determine whether R is taking responsibility for writing output to |
| 5023 | file; if so, this is signalled to ob.el by returning a nil result. | 5023 | file; if so, this is signaled to ob.el by returning a nil result. |
| 5024 | 5024 | ||
| 5025 | 2011-07-28 Dan Davison <dandavison7@gmail.com> | 5025 | 2011-07-28 Dan Davison <dandavison7@gmail.com> |
| 5026 | 5026 | ||
| @@ -18037,4 +18037,3 @@ | |||
| 18037 | 18037 | ||
| 18038 | You should have received a copy of the GNU General Public License | 18038 | You should have received a copy of the GNU General Public License |
| 18039 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 18039 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 18040 | |||
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 866176e4e8f..2fe512329ca 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el | |||
| @@ -2642,7 +2642,7 @@ If a region is active, all items inside will be moved." | |||
| 2642 | (defvar org-tab-ind-state) | 2642 | (defvar org-tab-ind-state) |
| 2643 | (defun org-cycle-item-indentation () | 2643 | (defun org-cycle-item-indentation () |
| 2644 | "Cycle levels of indentation of an empty item. | 2644 | "Cycle levels of indentation of an empty item. |
| 2645 | The first run indents the item, if applicable. Subsequents runs | 2645 | The first run indents the item, if applicable. Subsequent runs |
| 2646 | outdent it at meaningful levels in the list. When done, item is | 2646 | outdent it at meaningful levels in the list. When done, item is |
| 2647 | put back at its original position with its original bullet. | 2647 | put back at its original position with its original bullet. |
| 2648 | 2648 | ||
diff --git a/lisp/org/org.el b/lisp/org/org.el index da39aa189ba..10531b07325 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -2681,7 +2681,7 @@ When this variable is set to t, the date/time prompt will not let | |||
| 2681 | you specify dates outside the 1970-2037 range, so it is certain that | 2681 | you specify dates outside the 1970-2037 range, so it is certain that |
| 2682 | these dates will work in whatever version of Emacs you are | 2682 | these dates will work in whatever version of Emacs you are |
| 2683 | running, and also that you can move a file from one Emacs implementation | 2683 | running, and also that you can move a file from one Emacs implementation |
| 2684 | to another. WHenever Org is forcing the year for you, it will display | 2684 | to another. Whenever Org is forcing the year for you, it will display |
| 2685 | a message and beep. | 2685 | a message and beep. |
| 2686 | 2686 | ||
| 2687 | When this variable is nil, Org will check if the date is | 2687 | When this variable is nil, Org will check if the date is |