From 1bc0623be2da3da9789d526efb3b24f6d295fbbc Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sun, 6 Mar 2011 04:17:08 +0000 Subject: [PATCH 1/8] org mobile - call pre hooks earlier * lisp/org-mobile.el (org-mobile-push): Move call to hook, make it the first thing of the push operation. --- lisp/org-mobile.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el index 83462f0a7..332ec18e1 100644 --- a/lisp/org-mobile.el +++ b/lisp/org-mobile.el @@ -305,9 +305,9 @@ create all custom agenda views, for upload to the mobile phone." (org-agenda-redo-command org-agenda-redo-command)) (save-excursion (save-window-excursion + (run-hooks 'org-mobile-pre-push-hook) (org-mobile-check-setup) (org-mobile-prepare-file-lists) - (run-hooks 'org-mobile-pre-push-hook) (message "Creating agendas...") (let ((inhibit-redisplay t)) (org-mobile-create-sumo-agenda)) (message "Creating agendas...done") From 383cb5dcaa2f645de1d4574b0074fa6df84839bc Mon Sep 17 00:00:00 2001 From: Bernt Hansen Date: Wed, 13 Apr 2011 17:12:10 +0000 Subject: [PATCH 2/8] Fix agenda display when headlines are missing * lisp/org-agenda.el (org-agenda-get-timestamps): Fix agenda display when headlines are missing The following entry breaks the agenda display. ,---- | **** | :PROPERTIES: | :DateCreated: <2011-04-13 Mi 10:00> | :END: | | [[gnus:nntp%2BGwene:gwene.org.emacsen.planet][gnus:nntp+Gwene:gwene.org.emacsen.planet]] `---- Provide the empty string as the headline if the search for the headline returns nil. org-format-agenda-items requires a string for the headline parameter. --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a65d2d150..ae544779f 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4710,7 +4710,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', (setq hdmarker (org-agenda-new-marker) tags (org-get-tags-at)) (looking-at "\\*+[ \t]+\\([^\r\n]+\\)") - (setq head (match-string 1)) + (setq head (or (match-string 1) "")) (setq txt (org-format-agenda-item (if inactivep org-agenda-inactive-leader nil) head category tags timestr From 4262dc1cbc4006d3ed7addc69fc53040bfc8cf92 Mon Sep 17 00:00:00 2001 From: Bernt Hansen Date: Thu, 14 Apr 2011 03:05:25 +0000 Subject: [PATCH 3/8] Fix typo in agenda local variable * lisp/org-agenda.el (org-agenda-filter-by-tag): Fix variable name typo maybe-reftresh -> maybe-refresh --- lisp/org-agenda.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ae544779f..7c55bd595 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5905,7 +5905,7 @@ to switch to narrowing." (effort-prompt "") (inhibit-read-only t) (current org-agenda-filter) - maybe-reftresh a n tag) + maybe-refresh a n tag) (unless char (message "%s by tag [%s ], [TAB], %s[/]:off, [+-]:narrow, [>== char ?0) (<= char ?9) @@ -5974,9 +5974,9 @@ to switch to narrowing." (cons (concat (if strip "-" "+") tag) (if narrow current nil))) (org-agenda-filter-apply org-agenda-filter) - (setq maybe-reftresh t)) + (setq maybe-refresh t)) (t (error "Invalid tag selection character %c" char))) - (when (and maybe-reftresh + (when (and maybe-refresh (eq org-agenda-clockreport-mode 'with-filter)) (org-agenda-redo)))) From c56bf33812a0c7ee5ddfa8c73e598348c3bbf47a Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Tue, 12 Apr 2011 18:18:50 +0000 Subject: [PATCH 4/8] HTML export: correct a bug in coderef link. * org-html.el (org-html-make-link): correct a bug in coderef link. --- lisp/org-html.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 58fbc05d4..5d5347880 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -826,7 +826,8 @@ MAY-INLINE-P allows inlining it as an image." (not type) (string= type "http") (string= type "https") - (string= type "file")) + (string= type "file") + (string= type "coderef")) (if fragment (setq thefile (concat thefile "#" fragment)))) @@ -836,7 +837,8 @@ MAY-INLINE-P allows inlining it as an image." (setq thefile (let ((str (org-export-html-format-href thefile))) - (if (and type (not (string= "file" type))) + (if (and type (not (or (string= "file" type) + (string= "coderef" type)))) (concat type ":" str) str))) From c9958a399945b44389214af48a02fea034677823 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Sat, 16 Apr 2011 18:05:51 +0200 Subject: [PATCH 5/8] Fix agenda bulk commands * lisp/org-agenda.el (org-agenda-bulk-action): Do not use the entries variable before it is defined --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 7c55bd595..6bd697376 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7942,7 +7942,7 @@ The prefix arg is passed through to the command if possible." (buffer-live-p (marker-buffer m)) (marker-position m)) (error "Marker %s for bulk command is invalid" m))) - entries) + org-agenda-bulk-marked-entries) ;; Prompt for the bulk command (message "Bulk: [r]efile [$]arch [A]rch->sib [t]odo [+/-]tag [s]chd [S]catter [d]eadline [f]unction") From 89de03cb8e6819715df7a3b0345c530f149713f6 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Sun, 17 Apr 2011 16:41:40 +0200 Subject: [PATCH 6/8] Document the use of \vert in table fields * doc/org.texi (Built-in table editor): Document that \vert represents a vertical bar in a table field. --- doc/org.texi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index a2b4b5592..36a65dacd 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -1895,10 +1895,11 @@ calculator). @section The built-in table editor @cindex table editor, built-in -Org makes it easy to format tables in plain ASCII. Any line with -@samp{|} as the first non-whitespace character is considered part of a -table. @samp{|} is also the column separator. A table might look like -this: +Org makes it easy to format tables in plain ASCII. Any line with @samp{|} as +the first non-whitespace character is considered part of a table. @samp{|} +is also the column separator@footnote{To insert a vertical bar into a table +field, use @code{\vert} or, inside a word @code{abc\vert@{@}def}.}. A table +might look like this: @example | Name | Phone | Age | From 2f50b1380b4ff4ce62c05ae1a4c8aa5bb63f5178 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Tue, 19 Apr 2011 13:34:49 +0000 Subject: [PATCH 7/8] * org-html.el (org-html-handle-links): add an alternate for inline images --- lisp/org-html.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org-html.el b/lisp/org-html.el index 5d5347880..7a4564d85 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -888,7 +888,8 @@ OPT-PLIST is the export options list." (if (string-match "^file:" desc) (setq desc (substring desc (match-end 0))))) (setq desc (org-add-props - (concat "") + (concat "\""") '(org-protected t)))) (cond ((equal type "internal") From 6f2113b85ce29a2d906f3b1cc95372e3855f03cb Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 19 Apr 2011 11:23:55 +0200 Subject: [PATCH 8/8] doc/org.texi: Fix typo. Thanks to Xiao-Yong Jin for pointing this out. --- doc/org.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/org.texi b/doc/org.texi index 36a65dacd..8ca442695 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -8530,7 +8530,7 @@ This causes the following issues: Org needs to make a decision which @code{COLUMNS} format to use. Since the entries in the agenda are collected from different files, and different files may have different @code{COLUMNS} formats, this is a non-trivial problem. -Org first checks if the variable @code{org-overriding-columns-format} is +Org first checks if the variable @code{org-agenda-overriding-columns-format} is currently set, and if so, takes the format from there. Otherwise it takes the format associated with the first item in the agenda, or, if that item does not have a specific format (defined in a property, or in its file), it