From: joaotavora@gmail.com (João Távora)
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Yuri D'Elia <wavexx@thregr.org>,
Lars Magne Ingebrigtsen <larsi@gnus.org>,
emacs-devel@gnu.org
Subject: Re: electric-pair-mode as a minor mode?
Date: Sat, 11 Apr 2015 17:06:27 +0100 [thread overview]
Message-ID: <m2wq1i7ipo.fsf@gmail.com> (raw)
In-Reply-To: <jwvmw2um9jp.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon, 30 Mar 2015 18:02:15 -0400")
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
Stefan Monnier <monnier@iro.umontreal.ca> writes:
> I think in the case of the smiley regexps, rather than mark them as
> comments, it's better to only change the parenthesis's syntax to be
> "punctuation".
Since Lars hasn't responded yet, here's an updated patch that addresses
the issues discussed so far. OK to install?
João
[-- Attachment #2: 0001-Improve-sexp-based-movement-in-message-mode.patch --]
[-- Type: text/x-patch, Size: 5168 bytes --]
From 52dc7011b492523d898f797d85ee1ef924f0ad2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sat, 11 Apr 2015 16:52:44 +0100
Subject: [PATCH] Improve sexp-based movement in message-mode
Works by giving citations and smileys a different syntax. This helps
modes like `show-paren-mode', `electric-pair-mode', and C-M-*
sexp-based movement.
* lisp/gnus/message.el (message--syntax-propertize): New function.
(message-mode): Set syntax-related vars.
* test/automated/message-mode-tests.el: New file
---
lisp/gnus/message.el | 30 ++++++++++++++++++++-
test/automated/message-mode-tests.el | 52 ++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 test/automated/message-mode-tests.el
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 04145de..4a8a8a6 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2961,6 +2961,27 @@ See also `message-forbidden-properties'."
(autoload 'ecomplete-setup "ecomplete") ;; for Emacs <23.
+(defun message--syntax-propertize (beg end)
+ "Syntax-propertize certain message text specially."
+ (let ((citation-regexp (concat "^" message-cite-prefix-regexp ".*$"))
+ (smiley-regexp (regexp-opt '(":-)" ":)"
+ ":-(" ":("
+ ";-)" ";)"))))
+ (goto-char beg)
+ (while (search-forward-regexp citation-regexp
+ end 'noerror)
+ (let ((start (match-beginning 0))
+ (end (match-end 0)))
+ (add-text-properties start (1+ start)
+ '(syntax-table (11 . nil)))
+ (add-text-properties end (min (1+ end) (point-max))
+ '(syntax-table (12 . nil)))))
+ (goto-char beg)
+ (while (search-forward-regexp smiley-regexp
+ end 'noerror)
+ (add-text-properties (match-beginning 0) (match-end 0)
+ '(syntax-table (1 . nil))))))
+
;;;###autoload
(define-derived-mode message-mode text-mode "Message"
"Major mode for editing mail and news to be sent.
@@ -3063,7 +3084,14 @@ M-RET `message-newline-and-reformat' (break the line and reformat)."
;; multibyte is not necessary at all. -- zsh
(mm-enable-multibyte))
(set (make-local-variable 'indent-tabs-mode) nil) ;No tabs for indentation.
- (mml-mode))
+ (mml-mode)
+ ;; Syntactic fontification. Helps `show-paren-mode',
+ ;; `electric-pair-mode', and C-M-* navigation by syntactically
+ ;; excluding citations and other artifacts.
+ ;;
+ (setq-local syntax-propertize-function 'message--syntax-propertize)
+ (setq-local parse-sexp-lookup-properties t)
+ (setq-local parse-sexp-ignore-comments t))
(defun message-setup-fill-variables ()
"Setup message fill variables."
diff --git a/test/automated/message-mode-tests.el b/test/automated/message-mode-tests.el
new file mode 100644
index 0000000..6688a8a
--- /dev/null
+++ b/test/automated/message-mode-tests.el
@@ -0,0 +1,52 @@
+;;; message-mode-tests.el --- Tests for message-mdoe -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: João Távora <joaotavora@gmail.com>
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file contains tests for message-mode.
+
+;;; Code:
+(require 'ert)
+(require 'ert-x)
+
+(ert-deftest message-mode-propertize ()
+ (with-temp-buffer
+ (unwind-protect
+ (progn
+ (message-mode)
+ (insert "here's an opener (\n"
+ "here's a sad face :-(\n"
+ "> here's citing someone with an opener (\n"
+ "and here's a closer ")
+ (let ((last-command-event ?\)))
+ (ert-simulate-command '(self-insert-command 1)))
+ (backward-sexp)
+ (should (string= "here's an opener "
+ (buffer-substring-no-properties
+ (line-beginning-position)
+ (point))))
+ (forward-sexp)
+ (should (string= "and here's a closer )"
+ (buffer-substring-no-properties
+ (line-beginning-position)
+ (point)))))
+ (set-buffer-modified-p nil))))
+
+(provide 'message-mode-tests)
+;;; message-mode-tests.el ends here
--
1.8.2.3
next prev parent reply other threads:[~2015-04-11 16:06 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 19:51 electric-pair-mode as a minor mode? Yuri D'Elia
2015-03-27 2:18 ` Stefan Monnier
2015-03-27 8:04 ` Yuri D'Elia
2015-03-27 13:19 ` Stefan Monnier
2015-03-27 11:18 ` João Távora
2015-03-27 13:25 ` Stefan Monnier
2015-03-27 14:09 ` João Távora
2015-03-27 18:20 ` Stefan Monnier
2015-03-28 16:11 ` João Távora
2015-03-28 20:36 ` Stefan Monnier
2015-03-28 21:47 ` João Távora
2015-03-28 23:09 ` João Távora
2015-03-29 4:01 ` Stefan Monnier
2015-03-29 20:41 ` João Távora
2015-03-30 0:54 ` Stefan Monnier
2015-03-30 10:46 ` João Távora
2015-03-30 13:53 ` Stefan Monnier
2015-03-30 15:43 ` João Távora
2015-03-30 20:33 ` Stefan Monnier
2015-03-30 20:42 ` João Távora
2015-03-30 21:47 ` João Távora
2015-03-30 22:02 ` Stefan Monnier
2015-04-11 16:06 ` João Távora [this message]
2015-04-12 11:56 ` Stefan Monnier
2015-04-12 13:16 ` João Távora
2015-04-12 16:39 ` Dmitry Gutov
2015-04-12 22:16 ` João Távora
2015-04-12 23:10 ` Dmitry Gutov
2015-04-15 21:32 ` João Távora
2015-04-15 13:59 ` Lars Magne Ingebrigtsen
2015-04-15 21:16 ` João Távora
2015-04-15 21:21 ` Lars Magne Ingebrigtsen
2015-04-15 21:39 ` João Távora
2015-04-15 21:43 ` Lars Magne Ingebrigtsen
2015-04-26 10:28 ` João Távora
2015-04-26 19:48 ` Lars Magne Ingebrigtsen
2015-04-27 2:29 ` Stefan Monnier
2015-03-27 19:38 ` Yuri D'Elia
2015-03-27 12:52 ` Tom Willemse
2015-03-27 19:01 ` Stefan Monnier
2015-03-28 15:47 ` João Távora
2015-03-28 17:37 ` bug#19528: " Glenn Morris
2015-03-28 21:01 ` João Távora
2015-04-14 6:28 ` Glenn Morris
2015-03-28 15:47 ` João Távora
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2wq1i7ipo.fsf@gmail.com \
--to=joaotavora@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
--cc=monnier@iro.umontreal.ca \
--cc=wavexx@thregr.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.