From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joaotavora@gmail.com (=?utf-8?B?Sm/Do28gVMOhdm9yYQ==?=) Newsgroups: gmane.emacs.devel Subject: Re: electric-pair-mode as a minor mode? Date: Sat, 11 Apr 2015 17:06:27 +0100 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1428768412 24801 80.91.229.3 (11 Apr 2015 16:06:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 11 Apr 2015 16:06:52 +0000 (UTC) Cc: Yuri D'Elia , Lars Magne Ingebrigtsen , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 11 18:06:46 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ygxvg-0006Fa-81 for ged-emacs-devel@m.gmane.org; Sat, 11 Apr 2015 18:06:44 +0200 Original-Received: from localhost ([::1]:43229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ygxvf-0001VZ-EM for ged-emacs-devel@m.gmane.org; Sat, 11 Apr 2015 12:06:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ygxvb-0001VS-Jt for emacs-devel@gnu.org; Sat, 11 Apr 2015 12:06:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgxvW-0003XL-LO for emacs-devel@gnu.org; Sat, 11 Apr 2015 12:06:39 -0400 Original-Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:36122) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgxvW-0003Uk-9n for emacs-devel@gnu.org; Sat, 11 Apr 2015 12:06:34 -0400 Original-Received: by wizk4 with SMTP id k4so27560262wiz.1 for ; Sat, 11 Apr 2015 09:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=P03YO9hUByfSP0gtWIyEtpAYfW9AiAsd7c2NILp8yvk=; b=lZ3HtvX7n0pK80i/F1fwU0Nea5jr4F/wYdtmkj5ywaf6KSU6R4z0+Ztr8bOh1h3V4I RE3ts9IwdJU1fuAT4zRSETNUCUHVnmM1FqxPvwA1honEQc4q0TGz63JSDd4KQ828OsRq Dk5xAbYyujGku/eHhwdZR1JxIH4c2ieQGRWw8omemgDAAcY+EexJ8xwimhGtr+VQcsXo BpQ33apiYSOq5QP9sfx/V/KwqKrospAySfwdth6OydgfZIJ6k3N50WkPQ9m6Pm77mBtv 1UMigTDjFf8QQHq1V/7nmCqI/55FEjS1Xs5Jfn/KRwRTaUprx/5eQvsk8Mo7+BSGW+mM Pjcg== X-Received: by 10.180.37.101 with SMTP id x5mr6897084wij.74.1428768393458; Sat, 11 Apr 2015 09:06:33 -0700 (PDT) Original-Received: from king.yourcompany.com (31.57.37.188.rev.vodafone.pt. [188.37.57.31]) by mx.google.com with ESMTPSA id u6sm3345831wjy.13.2015.04.11.09.06.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2015 09:06:32 -0700 (PDT) In-Reply-To: (Stefan Monnier's message of "Mon, 30 Mar 2015 18:02:15 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (darwin) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::234 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185296 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Stefan Monnier 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=C3=A3o --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-Improve-sexp-based-movement-in-message-mode.patch Content-Transfer-Encoding: quoted-printable >From 52dc7011b492523d898f797d85ee1ef924f0ad2a Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Jo=3DC3=3DA3o=3D20T=3DC3=3DA1vora?=3D 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'." =20 (autoload 'ecomplete-setup "ecomplete") ;; for Emacs <23. =20 +(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 l= ine and reformat)." ;; multibyte is not necessary at all. -- zsh (mm-enable-multibyte)) (set (make-local-variable 'indent-tabs-mode) nil) ;No tabs for indentati= on. - (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)) =20 (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=C3=A3o T=C3=A1vora + +;; 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 . + +;;; 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=3D "here's an opener " + (buffer-substring-no-properties + (line-beginning-position) + (point)))) + (forward-sexp) + (should (string=3D "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 --=20 1.8.2.3 --=-=-=--