Merge branch 'maint'

lisp/ob-core.el

@@ -321,8 +321,8 @@ name of the code block."
 Do not query the user."
   (org-babel-check-confirm-evaluate info
     (not (when noeval
-	   (message (format "Evaluation of this%scode-block%sis disabled."
+	   (message "Evaluation of this%scode-block%sis disabled."
-			    code-block block-name))))))
+                    code-block block-name)))))
 
  ;; dynamically scoped for asynchronous export
 (defvar org-babel-confirm-evaluate-answer-no)
@@ -348,8 +348,8 @@ of potentially harmful code."
 		    (yes-or-no-p
 		     (format "Evaluate this%scode block%son your system? "
 			     code-block block-name)))
-	     (message (format "Evaluation of this%scode-block%sis aborted."
+	     (message "Evaluation of this%scode-block%sis aborted."
-			      code-block block-name)))))))
+                      code-block block-name))))))
 
 ;;;###autoload
 (defun org-babel-execute-safely-maybe ()

lisp/ob-fortran.el

@@ -156,8 +156,7 @@ of the same value."
       (format "real, parameter :: %S(%d) = %s\n"
 	      var (length val) (org-babel-fortran-transform-list val)))
      (t
-      (error (format "the type of parameter %s is not supported by ob-fortran"
+      (error "the type of parameter %s is not supported by ob-fortran" var)))))
-		     var))))))
 
 (defun org-babel-fortran-transform-list (val)
   "Return a fortran representation of enclose syntactic lists."

lisp/org-colview.el

@@ -206,9 +206,7 @@ This is the compiled version of the format.")
 	       (val (or (cdr ass) ""))
 	       (modval
 		(cond
-		 ((and org-columns-modify-value-for-display-function
+		 ((functionp org-columns-modify-value-for-display-function)
-		       (functionp
-			org-columns-modify-value-for-display-function))
 		  (funcall org-columns-modify-value-for-display-function
 			   title val))
 		 ((equal property "ITEM") (org-columns-compact-links val))
@@ -222,7 +220,13 @@ This is the compiled version of the format.")
 	       (string
 		(format f (org-columns-add-ellipses (or modval val) width)))
 	       (ov (org-columns-new-overlay
-		    (point) (1+ (point)) string (if dateline face1 face))))
+		    (point) (1+ (point))
+		    string
+		    (cond
+		     ((equal property "TODO")
+		      (list (org-get-todo-face val) (if dateline face1 face)))
+		     (dateline face1)
+		     (t face)))))
 	  (overlay-put ov 'keymap org-columns-map)
 	  (overlay-put ov 'org-columns-key property)
 	  (overlay-put ov 'org-columns-value (cdr ass))

lisp/org.el

@@ -6541,13 +6541,13 @@ When FACE-OR-COLOR is not a string, just return it."
 		       'org-priority)
 	     'font-lock-fontified t)))))
 
-(defun org-get-tag-face (kwd)
+(defun org-get-tag-face (tag)
-  "Get the right face for a TODO keyword KWD.
+  "Get the right face for TAG.
-If KWD is a number, get the corresponding match group."
+If TAG is a number, get the corresponding match group."
-  (if (numberp kwd) (setq kwd (match-string kwd)))
+  (let ((tag (if (wholenump tag) (match-string tag) tag)))
-  (or (org-face-from-face-or-color
+    (or (org-face-from-face-or-color
-       'tag 'org-tag (cdr (assoc kwd org-tag-faces)))
+	 'tag 'org-tag (cdr (assoc kwd org-tag-faces)))
-      'org-tag))
+	'org-tag)))
 
 (defun org-unfontify-region (beg end &optional maybe_loudly)
   "Remove fontification and activation overlays from links."

lisp/ox-latex.el

@@ -3433,7 +3433,7 @@ Return PDF file name or an error if it couldn't be produced."
 			      default-directory))
 	 (time (current-time))
 	 warnings)
-    (unless snippet (message (format "Processing LaTeX file %s..." texfile)))
+    (unless snippet (message "Processing LaTeX file %s..." texfile))
     (save-window-excursion
       (cond
        ;; A function is provided: Apply it.

lisp/ox-man.el

@@ -1196,7 +1196,7 @@ Return PDF file name or an error if it couldn't be produced."
 				(file-name-directory full-name)
 			      default-directory))
          errors)
-    (message (format "Processing Groff file %s..." file))
+    (message "Processing Groff file %s..." file)
     (save-window-excursion
       (cond
        ;; A function is provided: Apply it.

lisp/ox-odt.el

@@ -1410,8 +1410,8 @@ original parsed data.  INFO is a plist holding export options."
 	 ((member styles-file-type '("odt" "ott"))
 	  (org-odt--zip-extract styles-file "styles.xml" org-odt-zip-dir)))))
      (t
-      (error (format "Invalid specification of styles.xml file: %S"
+      (error "Invalid specification of styles.xml file: %S"
-		     (plist-get info :odt-styles-file)))))
+	     (plist-get info :odt-styles-file))))
 
     ;; create a manifest entry for styles.xml
     (org-odt-create-manifest-file-entry "text/xml" "styles.xml")

lisp/ox-texinfo.el

@@ -1589,7 +1589,7 @@ Return INFO file name or an error if it couldn't be produced."
 				(file-name-directory full-name)
 			      default-directory))
 	 errors)
-    (message (format "Processing Texinfo file %s..." file))
+    (message "Processing Texinfo file %s..." file)
     (save-window-excursion
       ;; Replace %b, %f and %o with appropriate values in each command
       ;; before applying it.  Output is redirected to "*Org INFO