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 2010-09-02 16:32:14 +02:00
parent f5ff5dbe5a 11e7a573a5
commit 452fe93d86
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EXPERIMENTAL/find-links-to-local.el
View File

@ -1,3 +0,0 @@
(defun org-find-links ()
(let* ((file (buffer-file-name))
(tname (file-truename file)))

6
contrib/lisp/org-wikinodes.el
View File

@ -119,10 +119,10 @@ setting of `org-wikinodes-create-targets'."
(let ((create org-wikinodes-create-targets)
visiting buffer m pos file rpl)
(setq pos
(or (org-find-exact-headling-in-buffer target (current-buffer))
(or (org-find-exact-headline-in-buffer target (current-buffer))
(and (eq org-wikinodes-scope 'directory)
(setq file (org-wikinodes-which-file target))
(org-find-exact-headling-in-buffer
(org-find-exact-headline-in-buffer
target (or (get-file-buffer file)
(find-file-noselect file))))))
(if pos
@ -288,7 +288,7 @@ with working links."
(delete-region (match-beginning 0) (match-end 0))
(save-match-data
(cond
((org-find-exact-headling-in-buffer link (current-buffer))
((org-find-exact-headline-in-buffer link (current-buffer))
;; Found in current buffer
(insert (format "[[#%s][%s]]" link link)))
((eq org-wikinodes-scope 'file)

2
lisp/org-agenda.el
View File

@ -5118,7 +5118,7 @@ The modified list may contain inherited tags, and tags matched by
(throw 'exit list))
(while (setq time (pop gridtimes))
(unless (and remove (member time have))
(setq time (int-to-string time))
(setq time (format "%2d" time))
(push (org-format-agenda-item
nil string "" nil
(concat (substring time 0 -2) ":" (substring time -2)))

3
lisp/org-publish.el
View File

@ -472,7 +472,8 @@ matching filenames."
(unless (plist-get (cdr prj) :components)
;; [[info:org:Selecting%20files]] shows how this is supposed to work:
(let* ((r (plist-get (cdr prj) :recursive))
(b (expand-file-name (plist-get (cdr prj) :base-directory)))
(b (expand-file-name (file-name-as-directory
(plist-get (cdr prj) :base-directory))))
(x (or (plist-get (cdr prj) :base-extension) "org"))
(e (plist-get (cdr prj) :exclude))
(i (plist-get (cdr prj) :include))