ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-11-05 12:14:25 +01:00
parent a2c71a6e35 6c48056b2b
commit 086d5ffe62
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-capture.el
View File

@ -24,14 +24,14 @@
;; ;;
;;; Commentary: ;;; Commentary:
;; This file contains an alternative implementation of the same functionality ;; This file contains an alternative implementation of the functionality
;; that is also provided by org-remember.el. The implementation is more ;; that used to be provided by org-remember.el. The implementation is more
;; streamlined, can produce more target types (e.g. plain list items or ;; streamlined, can produce more target types (e.g. plain list items or
;; table lines). Also, it does not use a temporary buffer for editing ;; table lines). Also, it does not use a temporary buffer for editing
;; the captured entry - instead it uses an indirect buffer that visits ;; the captured entry - instead it uses an indirect buffer that visits
;; the new entry already in the target buffer (this was an idea by Samuel ;; the new entry already in the target buffer (this was an idea by Samuel
;; Wales). John Wiegley's excellent `remember.el' is not needed for this ;; Wales). John Wiegley's excellent `remember.el' is not needed anymore
;; implementation, even though we borrow heavily from its ideas. ;; for this implementation, even though we borrow heavily from its ideas.
;; This implementation heavily draws on ideas by James TD Smith and ;; This implementation heavily draws on ideas by James TD Smith and
;; Samuel Wales, and, of cause, uses John Wiegley's remember.el as inspiration. ;; Samuel Wales, and, of cause, uses John Wiegley's remember.el as inspiration.

9
lisp/org.el
View File

@ -2044,16 +2044,14 @@ following situations:
note buffer with `C-1 C-c C-c'. The user is prompted for an org file, note buffer with `C-1 C-c C-c'. The user is prompted for an org file,
with `org-directory' as the default path." with `org-directory' as the default path."
:group 'org-refile :group 'org-refile
:group 'org-remember
:group 'org-capture :group 'org-capture
:type 'directory) :type 'directory)
(defcustom org-default-notes-file (convert-standard-filename "~/.notes") (defcustom org-default-notes-file (convert-standard-filename "~/.notes")
"Default target for storing notes. "Default target for storing notes.
Used as a fall back file for org-remember.el and org-capture.el, for Used as a fall back file for org-capture.el, for templates that
templates that do not specify a target file." do not specify a target file."
:group 'org-refile :group 'org-refile
:group 'org-remember
:group 'org-capture :group 'org-capture
:type '(choice :type '(choice
(const :tag "Default from remember-data-file" nil) (const :tag "Default from remember-data-file" nil)
@ -2083,7 +2081,6 @@ outline-path-completion Headlines in the current buffer are offered via
When nil, new notes will be filed to the end of a file or entry. 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 This can also be a list with cons cells of regular expressions that
are matched against file names, and values." are matched against file names, and values."
:group 'org-remember
:group 'org-capture :group 'org-capture
:group 'org-refile :group 'org-refile
:type '(choice :type '(choice
@ -21099,7 +21096,7 @@ Your bug report will be posted to the Org-mode mailing list.
(interactive) (interactive)
(mapc 'require (mapc 'require
'(org-agenda org-archive org-attach org-clock org-colview org-id '(org-agenda org-archive org-attach org-clock org-colview org-id
org-remember org-table org-timer))) org-table org-timer)))
;;;###autoload ;;;###autoload
(defun org-reload (&optional uncompiled) (defun org-reload (&optional uncompiled)