Merge branch 'maint'

lisp/ol-bbdb.el

@@ -162,13 +162,13 @@ used."
   '(("birthday" .
      (lambda (name years suffix)
        (concat "Birthday: [[bbdb:" name "][" name " ("
-    	       (format "%s" years)        ; handles numbers as well as strings
-    	       suffix ")]]")))
+	       (format "%s" years)        ; handles numbers as well as strings
+	       suffix ")]]")))
     ("wedding" .
      (lambda (name years suffix)
        (concat "[[bbdb:" name "][" name "'s "
-    	       (format "%s" years)
-    	       suffix " wedding anniversary]]"))))
+	       (format "%s" years)
+	       suffix " wedding anniversary]]"))))
   "How different types of anniversaries should be formatted.
 An alist of elements (STRING . FORMAT) where STRING is the name of an
 anniversary class and format is either:

lisp/org-agenda.el

@@ -8581,14 +8581,14 @@ When called with a prefix argument, include all archive files as well."
 	      (if (or org-agenda-category-filter
 		      (get 'org-agenda-category-filter :preset-filter))
 		  '(:eval (propertize
-	      		   (concat "["
+			   (concat "["
 	      			   (mapconcat
 	      			    'identity
 	      			    (append
 	      			     (get 'org-agenda-category-filter :preset-filter)
 	      			     org-agenda-category-filter)
 	      			    "")
-	      			   "]")
+				   "]")
 	      		   'face 'org-agenda-filter-category
 	      		   'help-echo "Category used in filtering")) "")
 	      (if (or org-agenda-tag-filter

lisp/org-habit.el

@@ -409,7 +409,7 @@ current time."
 			   'help-echo
 			   (concat (format-time-string
 				    (org-time-stamp-format)
- 				    (time-add starting (days-to-time (- start (time-to-days starting)))))
+				    (time-add starting (days-to-time (- start (time-to-days starting)))))
 				   (if donep " DONE" ""))
 			   graph))
       (setq start (1+ start)

lisp/org.el

@@ -16206,7 +16206,7 @@ BEG and END are buffer positions."
        ;; Emacs cannot overlay images from remote hosts.  Create it in
        ;; `temporary-file-directory' instead.
        (if (or (not file) (file-remote-p file))
-    	   temporary-file-directory
+	   temporary-file-directory
 	 default-directory)
        'overlays nil 'forbuffer org-preview-latex-default-process))))