Merge branch 'master' of orgmode.org:org-mode

4 files changed, 20 insertions, 16 deletions

diff --git a/doc/org.texi b/doc/org.texi
index a2b4b55..8ca4426 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 |
@@ -8529,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
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a65d2d1..6bd6973 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
@@ -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, [>=<?]:effort: "
@@ -5952,12 +5952,12 @@ to switch to narrowing."
 		(push modifier org-agenda-filter))))
 	(if (not (null org-agenda-filter))
 	    (org-agenda-filter-apply org-agenda-filter)))
-      (setq maybe-reftresh t))
+      (setq maybe-refresh t))
      ((equal char ?/)
       (org-agenda-filter-by-tag-show-all)
       (when (get 'org-agenda-filter :preset-filter)
 	(org-agenda-filter-apply org-agenda-filter))
-      (setq maybe-reftresh t))
+      (setq maybe-refresh t))
      ((or (equal char ?\ )
 	  (setq a (rassoc char alist))
 	  (and (>= 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))))
 
@@ -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")
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 58fbc05..7a4564d 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)))
 
@@ -886,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 "<img src=\"" desc "\"/>")
+		       (concat "<img src=\"" desc "\" alt=\"" 
+			       (file-name-nondirectory desc) "\"/>")
 		       '(org-protected t))))
       (cond
        ((equal type "internal")
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 83462f0..332ec18 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")