From da9638e6a372d2707cf10d459b8444292ab9de27 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Sun, 12 May 2019 14:19:01 +0200 Subject: Org writer: always indent src blocks content by 2 spaces Emacs always uses two spaces when indenting the content of src blocks, e.g., when exiting a `C-c '` edit-buffer. Pandoc used to indent contents by the space-equivalent of one tab, but now always uses two spaces, too. Closes: #5440 --- src/Text/Pandoc/Writers/Org.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs index 07c2a1eda..322174cff 100644 --- a/src/Text/Pandoc/Writers/Org.hs +++ b/src/Text/Pandoc/Writers/Org.hs @@ -169,8 +169,6 @@ blockToOrg (Header level attr inlines) = do else cr <> nest (level + 1) (propertiesDrawer attr) return $ headerStr <> " " <> contents <> drawerStr <> blankline blockToOrg (CodeBlock (_,classes,kvs) str) = do - opts <- gets stOptions - let tabstop = writerTabStop opts let startnum = maybe "" (\x -> ' ' : trimr x) $ lookup "startFrom" kvs let numberlines = if "numberLines" `elem` classes then if "continuedSourceBlock" `elem` classes @@ -181,7 +179,7 @@ blockToOrg (CodeBlock (_,classes,kvs) str) = do let (beg, end) = case at of [] -> ("#+BEGIN_EXAMPLE" ++ numberlines, "#+END_EXAMPLE") (x:_) -> ("#+BEGIN_SRC " ++ x ++ numberlines, "#+END_SRC") - return $ text beg $$ nest tabstop (text str) $$ text end $$ blankline + return $ text beg $$ nest 2 (text str) $$ text end $$ blankline blockToOrg (BlockQuote blocks) = do contents <- blockListToOrg blocks return $ blankline $$ "#+BEGIN_QUOTE" $$ -- cgit v1.2.3