emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Bastien <bzg@gnu.org>
To: Nicolas Goaziou <n.goaziou@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [BUG, PATCH] org-indent-mode not correctly deactivated
Date: Wed, 15 Jan 2014 17:34:38 +0100	[thread overview]
Message-ID: <87txd5ryox.fsf@bzg.ath.cx> (raw)
In-Reply-To: <877ga1s8s1.fsf@gmail.com> (Nicolas Goaziou's message of "Wed, 15 Jan 2014 13:56:46 +0100")

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

Hi Nicolas,

Nicolas Goaziou <n.goaziou@gmail.com> writes:

> There is no attached patch in your mail. Though, I don't understand why
> you think your approach is wrong. In `org-mode' mode definition, we can
> change:
>
>   (when org-startup-indented (require 'org-indent) (org-indent-mode 1))
>
> into:
>
>   (cond (org-startup-indented (require 'org-indent) (org-indent-mode 1))
>         ((org-bound-and-true-p org-indent-mode) (org-indent-mode -1)))

This will not work, because (org-bound-and-true-p org-indent-mode)
returns nil at the time `org-mode' is called.

> It's probably similar to what you wrote in your patch.

Here is my patch -- quite similar, except that it will disable
`org-indent-mode' for every restart once it has been activated
once, which is wrong, or at least to heavy-handed.

Maybe we can simply tell users to deactivate `org-indent-mode'
manually, but this feels wrong too.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix-org-indent.patch --]
[-- Type: text/x-diff, Size: 610 bytes --]

diff --git a/lisp/org.el b/lisp/org.el
index ee7965a..f77a0e1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5350,7 +5350,8 @@ The following commands are available:
   (modify-syntax-entry ?@ "w")
   (modify-syntax-entry ?\" "\"")
   (if org-startup-truncated (setq truncate-lines t))
-  (when org-startup-indented (require 'org-indent) (org-indent-mode 1))
+  (cond (org-startup-indented (require 'org-indent) (org-indent-mode 1))
+	((fboundp 'org-indent-initialize) (org-indent-mode 0)))
   (org-set-local 'font-lock-unfontify-region-function
 		 'org-unfontify-region)
   ;; Activate before-change-function

[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


-- 
 Bastien

next prev parent reply	other threads:[~2014-01-15 16:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-14 16:00 [BUG, PATCH] org-indent-mode not correctly deactivated Bastien
2014-01-15 12:56 ` Nicolas Goaziou
2014-01-15 16:34   ` Bastien [this message]
2014-01-15 16:44     ` Nicolas Goaziou
2014-01-15 16:53       ` Bastien
2014-01-15 16:56         ` Bastien
2014-01-15 21:26         ` Nicolas Goaziou
2014-01-16  0:19           ` Bastien

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:ee7965a dfblob:f77a0e1
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87txd5ryox.fsf@bzg.ath.cx \
    --to=bzg@gnu.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=n.goaziou@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).