From: Eli Zaretskii <eliz@gnu.org>
To: Erik Selberg <erik@selberg.org>
Cc: emacs-devel@gnu.org
Subject: Re: comint fix for shell colors
Date: Fri, 18 Nov 2016 12:07:46 +0200 [thread overview]
Message-ID: <83twb5cd8t.fsf@gnu.org> (raw)
In-Reply-To: <CAHa5c_PffwbxLuJhGapqX41_0UrpkTKqZY9+g1687fOiCP_0jQ@mail.gmail.com> (message from Erik Selberg on Mon, 14 Nov 2016 23:14:25 -0800)
> From: Erik Selberg <erik@selberg.org>
> Date: Mon, 14 Nov 2016 23:14:25 -0800
>
> I've been trying to use shell (vs term / mult-term) with bash / zsh and my color prompts. In comint,
> comint-highlight-prompt clobbers the colors. I made the following patch against 24.5 but I see comint has
> been updated in 25. What's the right process for adding this for 25? This is solved for me locally, but seems
> something that could be added for all.
Please rebase the patch on the current master branch and resubmit.
See also a few minor comments below.
> *** /tmp/comint.el 2016-11-14 23:04:50.000000000 -0800
> --- /Users/selberg/elisp/comint.el 2016-11-14 23:06:36.000000000 -0800
> ***************
> *** 104,109 ****
> --- 104,110 ----
> (require 'ring)
> (require 'ansi-color)
> (require 'regexp-opt) ;For regexp-opt-charset.
> + (require 'simple) ;For password-word-equivalents
simple.el is preloaded, so there shouldn't be a need to require it.
> + (defcustom comint-do-highlight-prompt t
> + "Highlight prompt. Set to nil to let underlying process set colors (useful for modern shells)"
The first line of the doc string should be a single complete
sentence. The rest should go to the next lines.
> + :type 'boolean
> + :group 'comint
> + :version "22.1"
Please update the version tag to 26.1.
> + )
Please don't put closing parentheses on a separate line.
> "Snapshot the current `comint-last-prompt'.
> Freezes the `font-lock-face' text property in place."
> (when comint-last-prompt
> + (if comint-do-highlight-prompt
> (with-silent-modifications
> (add-text-properties
> (car comint-last-prompt)
> (cdr comint-last-prompt)
> ! '(font-lock-face comint-highlight-prompt))
> ! )
> ! )
Once again, please put all the closing parentheses on the last line of
their sexp.
> ;; Reset comint-last-prompt so later on comint-output-filter does
> ;; not remove the font-lock-face text property of the previous
> ;; (this) prompt.
> ! (setq comint-last-prompt nil)
> ! ))
Same here.
> (setq comint-last-prompt
> (cons (copy-marker prompt-start) (point-marker)))
> ! (if comint-do-highlight-prompt
> ! (add-text-properties prompt-start (point)
> ! '(rear-nonsticky t
> ! font-lock-face comint-highlight-prompt))
> ! )
> ! )
And here.
Finally, please include with the patch a ChangeLog-style commit log
message for the changes, and a suitable entry for NEWS.
Thanks for working on this.
next prev parent reply other threads:[~2016-11-18 10:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-15 7:14 comint fix for shell colors Erik Selberg
2016-11-18 10:07 ` Eli Zaretskii [this message]
2016-11-18 14:25 ` Wolfgang Jenkner
2016-11-18 14:40 ` Eli Zaretskii
2016-11-18 15:06 ` Wolfgang Jenkner
2016-11-18 15:34 ` Eli Zaretskii
2016-11-18 15:40 ` Erik Selberg
2016-11-18 15:49 ` Wolfgang Jenkner
2016-11-18 15:53 ` Erik Selberg
2016-11-18 19:24 ` Erik Selberg
2016-11-18 19:50 ` Eli Zaretskii
2016-11-18 22:43 ` Erik Selberg
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.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83twb5cd8t.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=erik@selberg.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.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).