diff --git a/doc/org-manual.org b/doc/org-manual.org
index d249f32d6..f1a165371 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -6803,7 +6803,7 @@ using the =:formatter= parameter.
 - =:filetitle= ::
 
   Show title in the file column if the file has a =#+title=.
- 
+
 - =:hidefiles= ::
 
   Hide the file column when multiple files are used to produce the
@@ -13396,7 +13396,7 @@ general options (see [[*Export Settings]]).
   #+cindex: @samp{LANGUAGE}, keyword
   #+vindex: org-latex-packages-alist
   #+vindex: org-latex-language-alist
-  
+
   Language code of the primary document language.
 
   The list of language codes supported by Org is stored in the
@@ -18420,7 +18420,7 @@ results do not have a distinct name.
 
 Note that all the links pointing to a source block exported using
 =:exports none= will be broken.  This will make export process fail,
-unless broken links are allowed during export (see [[*Export Settings]]). 
+unless broken links are allowed during export (see [[*Export Settings]]).
 
 #+vindex: org-export-use-babel
 To stop Org from evaluating code blocks to speed exports, use the
@@ -22525,7 +22525,7 @@ within a buffer with the =STARTUP= options =inlineimages= and
 =noinlineimages=.
 
 [fn:120] The width can be customized in Emacs >= 24.1, built with
-imagemagick support. 
+imagemagick support.
 
 [fn:121] The corresponding in-buffer setting is: =#+STARTUP: fninline=
 or =#+STARTUP: nofninline=.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index cab64317f..4728528f8 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -239,7 +239,7 @@ produce results superior to Minted or Listings.
 *** Support for =#+include=-ing URLs
 
 =#+include: FILE= will now accept URLs as the file.
-*** Structure templates now respect case used in ~org-structure-template-alist~ 
+*** Structure templates now respect case used in ~org-structure-template-alist~
 
 The block type in ~org-structure-template-alist~ is not case-sensitive.
 When the block type starts from the upper case, structure template
@@ -348,7 +348,7 @@ The folding state can also be controlled on per-file basis using
 *** New custom setting ~org-icalendar-force-alarm~
 
 The new setting, when set to non-nil, makes Org create alarm at the
-event time when the alarm time is set to 0.  The default value is 
+event time when the alarm time is set to 0.  The default value is
 nil -- do not create alarms at the event time.
 
 ** New functions and changes in function arguments
@@ -493,7 +493,7 @@ restore earlier behavior add to your Emacs init file the following:
     (org-link-set-parameters "info" :insert-description nil))
 #+end_src
 
-*** New list of languages for LaTeX export: ~org-latex-language-alist~ 
+*** New list of languages for LaTeX export: ~org-latex-language-alist~
 
 ~org-latex-language-alist~ unifies into a single list the old language
 lists for the =babel= and =polyglossia= LaTeX packages:
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index b608bdd29..2b56dd0fb 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5934,7 +5934,7 @@ displayed in agenda view."
 	(setq result (org-diary-sexp-entry sexp sexp-entry date))
 	(when result
           ;; Only check if entry should be skipped on matching sexps.
- 	  (org-agenda-skip (org-element-at-point))
+          (org-agenda-skip (org-element-at-point))
 	  (setq marker (org-agenda-new-marker beg)
 		level (make-string (org-reduced-level (org-outline-level)) ? )
 		category (org-get-category beg)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index a1311a29d..cccddbffb 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -5357,7 +5357,7 @@ This extra caching is based on the following paper:
 Pugh [Information Processing Letters] (1990) Slow optimally balanced
  search strategies vs. cached fast uniformly balanced search
  strategies.  http://dx.doi.org/10.1016/0020-0190(90)90130-P
- 
+
 Also, see `org-element--cache-hash-left' and `org-element--cache-hash-right'.")
 (defvar-local org-element--cache-hash-left nil
   "Cached elements from `org-element--cache' for fast O(1) lookup.
@@ -5714,7 +5714,7 @@ This extra caching is based on the following paper:
 Pugh [Information Processing Letters] (1990) Slow optimally balanced
  search strategies vs. cached fast uniformly balanced search
  strategies.  http://dx.doi.org/10.1016/0020-0190(90)90130-P
- 
+
 Also, see `org-element--cache-size'."
   (interactive)
   (message "%.2f%% of cache searches hashed, %.2f%% non-hashable."
@@ -6307,7 +6307,7 @@ completing the request."
                       ;; Consider scenario when DATA lays within
                       ;; sensitive lines of PARENT that was found
                       ;; during phase 2.  For example:
-                      ;; 
+                      ;;
                       ;; #+ begin_quote
                       ;; Paragraph
                       ;; #+end_quote
@@ -7604,7 +7604,7 @@ the cache."
                             (move-start-to-next-match
                              (if last-match next-re fail-re)))
                           (when (and (or (not start) (eq (org-element-property :begin data) start))
-                                     (< (org-element-property :begin data) to-pos)) 
+                                     (< (org-element-property :begin data) to-pos))
                             ;; Calculate where next possible element
                             ;; starts and update START if needed.
 		            (setq start (next-element-start))
@@ -7625,7 +7625,7 @@ the cache."
                             (when (or (not restrict-elements)
                                       (memq (org-element-type data) restrict-elements))
                               ;; DATA matches restriction.  FUNC may
-                              ;; 
+                              ;;
                               ;; Call FUNC.  FUNC may move point.
                               (setq org-element-cache-map-continue-from nil)
                               (if org-element--cache-map-statistics
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 300e31a48..692c51a74 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -64,14 +64,14 @@
 ;; Consider the following Org mode link:
 ;; [[file:/path/to/file/file.ext][description]]
 ;; Only the word "description" is normally visible in this link.
-;; 
+;;
 ;; The way this partial visibility is achieved is combining the two
 ;; folding specs.  The whole link is folded using 'org-fold-hidden
 ;; folding spec, but the visible part is additionally folded using
 ;; 'org-fold-visible:
 ;;
 ;; <begin org-fold-hidden>[[file:/path/to/file/file.ext][<begin org-fold-visible>description<end org-fold-visible>]]<end org-fold-hidden>
-;; 
+;;
 ;; Because 'org-fold-visible has higher priority than
 ;; 'org-fold-hidden, it suppresses the 'org-fold-hidden effect and
 ;; thus reveals the description part of the link.
@@ -330,7 +330,7 @@ following symbols:
   of the folded regions may become visible for some external packages
   inserting text using `insert' instead of `insert-and-inherit' (the
   latter is rarely used in practice).
-  
+
 - `ignore-indirect': Do not decouple folding state in the indirect
   buffers.  This can speed up Emacs display engine (and thus motion of
   point), especially when large number of indirect buffers is being
diff --git a/lisp/org-fold.el b/lisp/org-fold.el
index 496ac719a..495f431cb 100644
--- a/lisp/org-fold.el
+++ b/lisp/org-fold.el
@@ -325,9 +325,9 @@ When ENTRY is non-nil, show the entire entry."
        (line-end-position 0)
        (save-excursion
          (if (re-search-forward
- 	      (concat "[\r\n]" (org-get-limited-outline-regexp)) nil t)
+              (concat "[\r\n]" (org-get-limited-outline-regexp)) nil t)
              (line-end-position 0)
- 	   (point-max)))
+           (point-max)))
        t
        'outline))))
 
@@ -398,9 +398,9 @@ Show the heading too, if it is currently invisible."
      (line-end-position 0)
      (save-excursion
        (if (re-search-forward
- 	    (concat "[\r\n]\\(" (org-get-limited-outline-regexp) "\\)") nil t)
- 	   (match-beginning 1)
- 	 (point-max)))
+            (concat "[\r\n]\\(" (org-get-limited-outline-regexp) "\\)") nil t)
+           (match-beginning 1)
+         (point-max)))
      nil
      'outline)
     (when hide-drawers (org-cycle-hide-drawers 'children))))
diff --git a/lisp/org.el b/lisp/org.el
index 036384a04..169f24472 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7950,8 +7950,8 @@ the whole buffer."
                    (put-text-property
                     (save-excursion (org-back-to-heading-or-point-min t))
                     (save-excursion (if (org-before-first-heading-p)
-        			        (point-max)
-        			      (org-end-of-subtree t t)))
+                                        (point-max)
+                                      (org-end-of-subtree t t)))
                     'org-category
                     value)))))))))))
 
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 557e7b6ad..34ff52b81 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1974,7 +1974,7 @@ holding export options."
      ;; Date.
      ;; LaTeX displays today's date by default. One can override this by
      ;; inserting \date{} for no date, or \date{string} with any other
-     ;; string to be displayed as the date. 
+     ;; string to be displayed as the date.
      (let ((date (and (plist-get info :with-date) (org-export-get-date info))))
        (format "\\date{%s}\n" (org-export-data date info)))
      ;; Title and subtitle.