From: Rasmus <rasmus@gmx.us>
To: emacs-orgmode@gnu.org
Subject: Re: [patch] better(?) indention for cdlatex-environment
Date: Sat, 14 Feb 2015 01:29:26 +0100 [thread overview]
Message-ID: <87twypgwt5.fsf@gmx.us> (raw)
In-Reply-To: 873869h0cd.fsf@gmx.us
[-- Attachment #1: Type: text/plain, Size: 885 bytes --]
Rasmus <rasmus@gmx.us> writes:
> Hi,
>
> Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
>
>>> I don't feel strongly about it. Anyway, I like this better. Cdlatex is,
>>> um, "opinionated" about is insertion of newlines.
>>
>> I still think it is better to split line. Your behaviour just requires
>> a C-e before calling the function.
>
> I agree that the "simpler" approach is better. That's what I mean by the
> "this" above.
This patch applies indentation unless at BOL in which case it stays at
BOL. The rest is basically just to work with cdlatex and not insert too
many blank lines. It's still quicky, but these quirks seem to be cdlatex
quirks.
I wonder, are there any commands to merge two elements buffer-undo-list
into one? 'Cause ATM it takes two undo-presses to undo an environment
insert via this command.
—Rasmus
--
El Rey ha muerto. ¡Larga vida al Rey!
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org.el-Change-indention-for-cdlatex-environments.patch --]
[-- Type: text/x-diff, Size: 2427 bytes --]
From 85e6e454412c20b13d10e3d2b15dd3f9cb7e3a6b Mon Sep 17 00:00:00 2001
From: rasmus <rasmus@gmx.us>
Date: Tue, 10 Feb 2015 12:02:59 +0100
Subject: [PATCH] org.el: Change indention for cdlatex environments
* org.el (org-cdlatex-environment-indent): Use different indent
algorithm based on content above the new latex-environment.
---
lisp/org.el | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 59b245a..eaa9084 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18645,12 +18645,47 @@ Revert to the normal definition outside of these fragments."
(call-interactively (key-binding (vector last-input-event))))))
(defun org-cdlatex-environment-indent (&optional environment item)
- "Execute `cdlatex-environment' and indent the inserted environment."
+ "Execute `cdlatex-environment' and indent the inserted environment.
+
+The inserted environment is indented to current indentation
+unless point is at the beginning of the line in which case no
+indentation occurs."
(interactive)
- (cdlatex-environment environment item)
- (let ((element (org-element-at-point)))
- (org-indent-region (org-element-property :begin element)
- (org-element-property :end element))))
+ (let ((non-blank-eolp
+ (save-excursion
+ (and (not (save-excursion
+ (skip-chars-backward " \t")
+ (bolp)))
+ (progn (skip-chars-forward " \t") (eolp)))))
+ (ind (if (bolp) 0
+ (save-excursion
+ (unless (and (bolp)
+ (save-excursion
+ (skip-chars-forward " \t")
+ (eolp)))
+ (org-return-indent))
+ (org-get-indentation)))))
+ ;; Skip forward to next bol to avoid extra newline from
+ ;; cdlatex-environment.
+ (when non-blank-eolp (forward-line 1) (beginning-of-line))
+ (cdlatex-environment environment item)
+ ;; Indent new latex-environment.
+ (unless (zerop ind)
+ (let* ((element (org-element-at-point))
+ (beg (org-element-property :begin element))
+ (end (copy-marker
+ (save-excursion
+ (goto-char (org-element-property :end element))
+ (skip-chars-backward " \t\n\r")
+ (point)))))
+ (save-excursion
+ (goto-char beg)
+ (beginning-of-line)
+ (while (<= (point) end)
+ (org-indent-to-column ind)
+ (forward-line 1)))
+ (set-marker end nil))
+ (forward-char ind))))
\f
;;;; LaTeX fragments
--
2.3.0
next prev parent reply other threads:[~2015-02-14 0:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 11:28 [patch] better(?) indention for cdlatex-environment Rasmus
2015-02-10 12:27 ` Rasmus
2015-02-10 22:35 ` Nicolas Goaziou
2015-02-11 11:26 ` Rasmus
2015-02-11 21:39 ` Nicolas Goaziou
2015-02-11 23:40 ` Rasmus
2015-02-13 22:10 ` Nicolas Goaziou
2015-02-13 23:13 ` Rasmus
2015-02-14 0:29 ` Rasmus [this message]
2015-02-14 21:20 ` Nicolas Goaziou
2015-02-15 0:08 ` Rasmus
2015-02-15 9:52 ` Nicolas Goaziou
2015-02-17 0:41 ` Rasmus
2015-02-17 8:51 ` Nicolas Goaziou
2015-02-17 21:19 ` Rasmus
2015-02-18 0:39 ` Nicolas Goaziou
2015-02-18 1:06 ` Rasmus
2015-02-19 0:22 ` Rasmus
2015-02-19 23:11 ` Rasmus
2015-02-19 23:23 ` Nicolas Goaziou
2015-02-19 23:32 ` Rasmus
2015-02-20 0:13 ` Nicolas Goaziou
2015-02-20 0:38 ` Rasmus
2015-02-20 10:16 ` Nicolas Goaziou
2015-02-20 10:35 ` Rasmus
2015-02-20 10:40 ` Nicolas Goaziou
2015-02-20 10:43 ` Rasmus
2015-02-20 10:49 ` Nicolas Goaziou
2015-02-20 10:54 ` Rasmus
2015-02-20 11:17 ` Nicolas Goaziou
2015-02-20 10:50 ` Rasmus
2015-02-14 1:10 ` Nicolas Goaziou
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=87twypgwt5.fsf@gmx.us \
--to=rasmus@gmx.us \
--cc=emacs-orgmode@gnu.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).