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

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Carsten Dominik 2008-03-05 23:49:28 +01:00
parent 99e22650f8 dfa6bdb2f7
commit 504bd65683
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CONTRIB/lisp/org-annotate-file.el
View File

@ -68,15 +68,18 @@ location in the file")
"non-nil means always expand the full tree when you visit "non-nil means always expand the full tree when you visit
`org-annotate-file-storage-file'.") `org-annotate-file-storage-file'.")
(defun org-annotate-file-prettyfy-desc (string) (defun org-annotate-file-elipsify-desc (string &optional after)
"Strip starting and ending whitespace and replace any chars "Strip starting and ending whitespace and replace any chars
after the 60th with '...'" that appear after the value in `after' with '...'"
(let ((replace-map '(("^[ \t]*" . "") (let* ((after (number-to-string (or after 30)))
("[ \t]*$" . "") (replace-map (list (cons "^[ \t]*" "")
("^\\(.\\{60\\}\\).*" . "\\1...")))) (cons "[ \t]*$" "")
(dolist (replace replace-map) (cons (concat "^\\(.\\{" after
(when (string-match (car replace) string) "\\}\\).*") "\\1..."))))
(setq string (replace-match (cdr replace) nil nil string)))) (mapc (lambda (x)
(when (string-match (car x) string)
(setq string (replace-match (cdr x) nil nil string))))
replace-map)
string)) string))
(defun org-annotate-file () (defun org-annotate-file ()
@ -91,10 +94,10 @@ after the 60th with '...'"
show the relevant section" show the relevant section"
(let* ((filename (abbreviate-file-name (or buffer (buffer-file-name)))) (let* ((filename (abbreviate-file-name (or buffer (buffer-file-name))))
(line (buffer-substring-no-properties (point-at-bol) (point-at-eol))) (line (buffer-substring-no-properties (point-at-bol) (point-at-eol)))
(link (org-make-link-string (concat "file:" filename))) (link (org-make-link-string (concat "file:" filename) filename))
(search-link (org-make-link-string (search-link (org-make-link-string
(concat "file:" filename "::" line) (concat "file:" filename "::" line)
(org-annotate-file-prettyfy-desc line)))) (org-annotate-file-elipsify-desc line))))
(with-current-buffer (find-file org-annotate-file-storage-file) (with-current-buffer (find-file org-annotate-file-storage-file)
(unless (org-mode-p) (unless (org-mode-p)
(org-mode)) (org-mode))

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-03-05 Bastien Guerry <bzg@altern.org>
* org.el (org-follow-link-hook): New hook.
(org-agenda-custom-commands): Added "Component" as a tag for each
item in a command serie.
(org-open-at-point): Run `org-follow-link-hook'.
2008-03-04 Bastien Guerry <bzg@altern.org> 2008-03-04 Bastien Guerry <bzg@altern.org>
* org.el (org-agenda-schedule): Bugfix: don't display marker type * org.el (org-agenda-schedule): Bugfix: don't display marker type

10
org.el
View File

@ -1246,6 +1246,11 @@ negates this setting for the duration of the command."
:tag "Org Follow Link" :tag "Org Follow Link"
:group 'org-link) :group 'org-link)
(defcustom org-follow-link-hook nil
"Hook that is run after a link has been followed."
:group 'org-link-follow
:type 'hook)
(defcustom org-tab-follows-link nil (defcustom org-tab-follows-link nil
"Non-nil means, on links TAB will follow the link. "Non-nil means, on links TAB will follow the link.
Needs to be set before org.el is loaded." Needs to be set before org.el is loaded."
@ -2491,7 +2496,7 @@ should provide a description for the prefix, like
(list :tag "Command series, all agenda files" (list :tag "Command series, all agenda files"
(string :tag "Access Key(s)") (string :tag "Access Key(s)")
(string :tag "Description ") (string :tag "Description ")
(repeat (repeat :tag "Component"
(choice (choice
(const :tag "Agenda" (agenda)) (const :tag "Agenda" (agenda))
(const :tag "TODO list" (alltodo)) (const :tag "TODO list" (alltodo))
@ -12935,7 +12940,8 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
(t (t
(browse-url-at-point))))) (browse-url-at-point)))))
(move-marker org-open-link-marker nil)) (move-marker org-open-link-marker nil)
(run-hook-with-args 'org-follow-link-hook))
;;; File search ;;; File search