[elpa] master cd89ca3 2/2: Merge commit '08d846a7aa748209d65fecead2b6a766c3e5cb41' from highlight-escape-sequences

[Dmitry Gutov]

branch: master
commit cd89ca3845a5bb8fd160701d01951a190cb70c3f
Merge: 5aa4679 08d846a
Author: Dmitry Gutov 
Commit: Dmitry Gutov 

Merge commit '08d846a7aa748209d65fecead2b6a766c3e5cb41' from 
highlight-escape-sequences
---
 .../highlight-escape-sequences/highlight-escape-sequences.el   | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/highlight-escape-sequences/highlight-escape-sequences.el 
b/packages/highlight-escape-sequences/highlight-escape-sequences.el
index e829ab3..0ee2991 100644
--- a/packages/highlight-escape-sequences/highlight-escape-sequences.el
+++ b/packages/highlight-escape-sequences/highlight-escape-sequences.el
@@ -1,12 +1,12 @@
 ;;; highlight-escape-sequences.el --- Highlight escape sequences -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2013, 2015, 2016  Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2015-2017  Free Software Foundation, Inc.
 
 ;; Author:   Dmitry Gutov 
 ;; Pavel Matcula 
 ;; URL:  https://github.com/dgutov/highlight-escape-sequences
 ;; Keywords: convenience
-;; Version:  0.3
+;; Version:  0.4
 
 ;; This file is part of GNU Emacs.
 
@@ -32,8 +32,9 @@
 ;; `font-lock-regexp-grouping-backslash' by default, respectively.
 
 ;; It currently supports `ruby-mode', `emacs-lisp-mode', JS escape
-;; sequences in both popular modes, C escapes is `c-mode', `c++-mode'
-;; and `objc-mode', and Java escapes in `java-mode' and `clojure-mode'.
+;; sequences in both popular modes, C escapes is `c-mode', `c++-mode',
+;; `objc-mode' and `go-mode',
+;; and Java escapes in `java-mode' and `clojure-mode'.
 
 ;; To enable it elsewhere, customize `hes-mode-alist'.
 
@@ -187,6 +188,7 @@ Currently handles:
   `((c-mode  . ,hes-c/c++/objc-escape-sequence-re)
 (c++-mode. ,hes-c/c++/objc-escape-sequence-re)
 (objc-mode   . ,hes-c/c++/objc-escape-sequence-re)
+(go-mode . ,hes-c/c++/objc-escape-sequence-re)
 (java-mode   . ,hes-java-escape-sequence-re)
 (clojure-mode. ,hes-java-escape-sequence-re)
 (js-mode . ,hes-js-escape-sequence-re)

[elpa] master 08d846a 1/2: Add go-mode support

[Dmitry Gutov]

branch: master
commit 08d846a7aa748209d65fecead2b6a766c3e5cb41
Author: Dmitry Gutov 
Commit: Dmitry Gutov 

Add go-mode support

Closes #5
---
 highlight-escape-sequences.el | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/highlight-escape-sequences.el b/highlight-escape-sequences.el
index e829ab3..0ee2991 100644
--- a/highlight-escape-sequences.el
+++ b/highlight-escape-sequences.el
@@ -1,12 +1,12 @@
 ;;; highlight-escape-sequences.el --- Highlight escape sequences -*- 
lexical-binding: t -*-
 
-;; Copyright (C) 2013, 2015, 2016  Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2015-2017  Free Software Foundation, Inc.
 
 ;; Author:   Dmitry Gutov 
 ;; Pavel Matcula 
 ;; URL:  https://github.com/dgutov/highlight-escape-sequences
 ;; Keywords: convenience
-;; Version:  0.3
+;; Version:  0.4
 
 ;; This file is part of GNU Emacs.
 
@@ -32,8 +32,9 @@
 ;; `font-lock-regexp-grouping-backslash' by default, respectively.
 
 ;; It currently supports `ruby-mode', `emacs-lisp-mode', JS escape
-;; sequences in both popular modes, C escapes is `c-mode', `c++-mode'
-;; and `objc-mode', and Java escapes in `java-mode' and `clojure-mode'.
+;; sequences in both popular modes, C escapes is `c-mode', `c++-mode',
+;; `objc-mode' and `go-mode',
+;; and Java escapes in `java-mode' and `clojure-mode'.
 
 ;; To enable it elsewhere, customize `hes-mode-alist'.
 
@@ -187,6 +188,7 @@ Currently handles:
   `((c-mode  . ,hes-c/c++/objc-escape-sequence-re)
 (c++-mode. ,hes-c/c++/objc-escape-sequence-re)
 (objc-mode   . ,hes-c/c++/objc-escape-sequence-re)
+(go-mode . ,hes-c/c++/objc-escape-sequence-re)
 (java-mode   . ,hes-java-escape-sequence-re)
 (clojure-mode. ,hes-java-escape-sequence-re)
 (js-mode . ,hes-js-escape-sequence-re)

[elpa] master 6bc26c1: * adaptive-wrap/adaptive-wrap.el: Fix interaction with visual-fill

[Stefan Monnier]

branch: master
commit 6bc26c1d649607fb1d7aa514dfde576c4eeeaa98
Author: Stefan Monnier 
Commit: Stefan Monnier 

* adaptive-wrap/adaptive-wrap.el: Fix interaction with visual-fill

(adaptive-wrap-prefix-function): Remove problematic 'display' properties
as well.
---
 packages/adaptive-wrap/adaptive-wrap.el | 36 -
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/packages/adaptive-wrap/adaptive-wrap.el 
b/packages/adaptive-wrap/adaptive-wrap.el
index 5e073f1..6237924 100644
--- a/packages/adaptive-wrap/adaptive-wrap.el
+++ b/packages/adaptive-wrap/adaptive-wrap.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stephen Berman 
 ;; Stefan Monnier 
-;; Version: 0.5.2
+;; Version: 0.6
 
 ;; 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
@@ -94,19 +94,27 @@ extra indent = 2
   (setq beg (point))
   (while (< (point) end)
 (let ((lbp (point)))
-  (put-text-property (point)
- (progn (search-forward "\n" end 'move) (point))
- 'wrap-prefix
-(let ((pfx (adaptive-wrap-fill-context-prefix
-lbp (point
-  ;; Remove any `wrap-prefix' property that
-  ;; might have been added earlier.
-  ;; Otherwise, we end up with a string
-  ;; containing a `wrap-prefix' string
-  ;; containing a `wrap-prefix' string ...
-  (remove-text-properties
-   0 (length pfx) '(wrap-prefix) pfx)
-  pfx
+  (put-text-property
+   (point) (progn (search-forward "\n" end 'move) (point))
+   'wrap-prefix
+   (let ((pfx (adaptive-wrap-fill-context-prefix
+  lbp (point
+;; Remove any `wrap-prefix' property that
+;; might have been added earlier.
+;; Otherwise, we end up with a string
+;; containing a `wrap-prefix' string
+;; containing a `wrap-prefix' string ...
+(remove-text-properties
+ 0 (length pfx) '(wrap-prefix) pfx)
+ (let ((dp (get-text-property 0 'display pfx)))
+   (when (and dp (eq dp (get-text-property (1- lbp) 'display)))
+ ;; There's a `display' property which covers not just the
+ ;; prefix but also the previous newline.  So it's not just making
+ ;; the prefix more pretty and could interfere or even defeat our
+ ;; efforts (e.g. it comes from `visual-fill-mode').
+ (remove-text-properties
+ 0 (length pfx) '(display) pfx)))
+pfx
   `(jit-lock-bounds ,beg . ,end))
 
 ;;;###autoload

[elpa] externals/fountain-mode a3ff805: * fountain-mode.el: Remove redundant :group args.

[Stefan Monnier]

branch: externals/fountain-mode
commit a3ff80514fc2810e427169f4b736ba92d376d406
Author: Stefan Monnier 
Commit: Stefan Monnier 

* fountain-mode.el: Remove redundant :group args.
---
 fountain-mode.el | 216 +--
 1 file changed, 67 insertions(+), 149 deletions(-)

diff --git a/fountain-mode.el b/fountain-mode.el
index 1579836..7ef11ff 100644
--- a/fountain-mode.el
+++ b/fountain-mode.el
@@ -312,8 +312,7 @@
   :options '(turn-on-visual-line-mode
  fountain-outline-hide-custom-level
  fountain-completion-update
- turn-on-flyspell)
-  :group 'fountain)
+ turn-on-flyspell))
 
 (defcustom fountain-script-format "screenplay"
   "Default script format for editing and exporting.
@@ -322,8 +321,7 @@ Can be overridden in metadata with, e.g.
 
 format: teleplay"
   :type 'string
-  :safe 'string
-  :group 'fountain)
+  :safe 'string)
 
 (defcustom fountain-add-continued-dialog
   t
@@ -335,8 +333,7 @@ successively speaking characters with 
`fountain-continued-dialog-refresh'.
 When nil, remove `fountain-continued-dialog-string' with
 `fountain-continued-dialog-refresh'."
   :type 'boolean
-  :safe 'booleanp
-  :group 'fountain)
+  :safe 'booleanp)
 
 (defcustom fountain-continued-dialog-string
   "(CONT'D)"
@@ -351,15 +348,13 @@ variable, first make sure to set 
`fountain-add-continued-dialog'
 to nil and run `fountain-continued-dialog-refresh', then make the
 changes desired."
   :type 'string
-  :safe 'stringp
-  :group 'fountain)
+  :safe 'stringp)
 
 (defcustom fountain-hide-emphasis-delim
   nil
   "If non-nil, make emphasis delimiters invisible."
   :type 'boolean
   :safe 'booleanp
-  :group 'fountain
   :set (lambda (symbol value)
  (set-default symbol value)
  (dolist (buffer (buffer-list))
@@ -375,7 +370,6 @@ changes desired."
   "If non-nil, make syntax characters invisible."
   :type 'boolean
   :safe 'booleanp
-  :group 'fountain
   :set (lambda (symbol value)
  (set-default symbol value)
  (dolist (buffer (buffer-list))
@@ -391,8 +385,7 @@ changes desired."
   "Format of date and time used when inserting `{{time}}'.
 See `format-time-string'."
   :type 'string
-  :safe 'stringp
-  :group 'fountain)
+  :safe 'stringp)
 
 (defcustom fountain-note-template
   " {{time}} - {{fullname}}: "
@@ -410,8 +403,7 @@ The default {{time}} - {{fullname}}: will insert something 
like:
 
 [[ 2017-12-31 - Alan Smithee: ]]"
   :type 'string
-  :safe 'stringp
-  :group 'fountain)
+  :safe 'stringp)
 
 
 ;;; Aligning
@@ -438,7 +430,6 @@ To disable element alignment, see `fountain-align-element'."
 This option does not affect file contents."
   :type 'boolean
   :safe 'booleanp
-  :group 'fountain-align
   :set #'fountain--set-and-refresh-all-font-lock)
 
 (defcustom fountain-align-section-heading
@@ -450,7 +441,6 @@ This option does not affect file contents."
 This option does not affect file contents."
   :type '(choice integer
  (repeat (group (string :tag "Format") integer)))
-  :group 'fountain-align
   :set #'fountain--set-and-refresh-all-font-lock)
 
 (defcustom fountain-align-scene-heading
@@ -462,7 +452,6 @@ This option does not affect file contents."
 This option does not affect file contents."
   :type '(choice integer
  (repeat (group (string :tag "Format") integer)))
-  :group 'fountain-align
   :set #'fountain--set-and-refresh-all-font-lock)
 
 (defcustom fountain-align-synopsis
@@ -474,7 +463,6 @@ This option does not affect file contents."
 This option does not affect file contents."
   :type '(choice integer
  (repeat (group (string :tag "Format") integer)))
-  :group 'fountain-align
   :set #'fountain--set-and-refresh-all-font-lock)
 
 (defcustom fountain-align-action
@@ -486,7 +474,6 @@ This option does not affect file contents."
 This option does not affect file contents."
   :type '(choice integer
  (repeat (group (string :tag "Format") integer)))
-  :group 'fountain-align
   :set #'fountain--set-and-refresh-all-font-lock)
 
 (defcustom fountain-align-character
@@ -498,7 +485,6 @@ This option does not affect file contents."
 This option does not affect file contents."
   :type '(choice integer
  (repeat (group (string :tag "Format") integer)))
-  :group 'fountain-align
   :set #'fountain--set-and-refresh-all-font-lock)
 
 (defcustom fountain-align-dialog
@@ -510,7 +496,6 @@ This option does not affect file contents."
 This option does not affect file contents."
   :type '(choice integer
  (repeat (group (string :tag "Format") integer)))
-  :group 'fountain-align
   :set #'fountain--set-and-refresh-all-font-lock)
 
 (defcustom fountain-align-paren
@@ -522,7 +507,6 @@ This option does not affect file contents."
 This option does not affect file contents."
   :type '(choice integer
  (repeat (group (string :tag "Format") integer)))
-  :group 'fountain-alig

[elpa] master d4754e7: * markchars/markchars.el (markchars-set-keywords): Fix markchars-confusables.

[Juri Linkov]

branch: master
commit d4754e7bb8bf10776fc874e8ef838e13448b4d36
Author: Juri Linkov 
Commit: Juri Linkov 

* markchars/markchars.el (markchars-set-keywords): Fix 
markchars-confusables.
---
 packages/markchars/markchars.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/markchars/markchars.el b/packages/markchars/markchars.el
index 974456a..1f96a87 100644
--- a/packages/markchars/markchars.el
+++ b/packages/markchars/markchars.el
@@ -3,7 +3,7 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Contributhor: Ted Zlatanov 
 ;; Created: 2010-03-22 Mon
-;; Version: 0.2.0
+;; Version: 0.2.1
 ;; Last-Updated: 2011-04-15
 ;; URL:
 ;; Keywords:
@@ -133,7 +133,7 @@ By default it matches nonascii-chars."
   (list 0 '(markchars--render-nonidn
 (match-beginning 0)
 (match-end 0)
-((eq what 'confusables)
+((eq what 'markchars-confusables)
  (list
   "\\<\\w+\\>"
   (list 0 '(markchars--render-confusables

[elpa] master 5b449c4: * visual-fill.el: New packagepackages/visual-fill/visual-fill.el

[Stefan Monnier]

branch: master
commit 5b449c4803b17efdc618b141cbeb6123cf11db5e
Author: Stefan Monnier 
Commit: Stefan Monnier 

* visual-fill.el: New packagepackages/visual-fill/visual-fill.el
---
 packages/visual-fill/visual-fill.el | 75 +
 1 file changed, 75 insertions(+)

diff --git a/packages/visual-fill/visual-fill.el 
b/packages/visual-fill/visual-fill.el
new file mode 100644
index 000..c8fae2f
--- /dev/null
+++ b/packages/visual-fill/visual-fill.el
@@ -0,0 +1,75 @@
+;;; visual-fill.el --- Auto-refill paragraphs without modifying the buffer  
-*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018  Stefan Monnier
+
+;; Author: Stefan Monnier 
+;; Keywords: 
+
+;; 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 `visual-fill-mode' minor mode basically "unfills" paragraphs within
+;; jit-lock, hence without modifying the buffer.  Combined with the normal
+;; line-wrapping this performs a kind of "auto refill" which can be more or
+;; less sophisticated depending on the line-wrapping used.
+;;
+;; For best effect, combine it with `visual-line-mode' and
+;; `adaptive-wrap-prefix-mode'.
+
+;;; Code:
+
+(defconst visual-fill--space " ")
+
+(defun visual-fill--cleanup (start end)
+  (while (and (< start end)
+  (setq start (text-property-any start end 'display 
visual-fill--space)))
+(remove-text-properties
+ start
+ (setq start (or (text-property-not-all start end
+'display visual-fill--space)
+ end))
+ '(display nil
+
+(defun visual-fill--jit (start end)
+  (visual-fill--cleanup start end)
+  (goto-char start)
+  (forward-line 0)
+  (let ((after-sep (looking-at paragraph-separate)))
+(while (< (point) end)
+  (forward-line 1)
+  (if after-sep
+  (setq after-sep (looking-at paragraph-separate))
+(unless (or (setq after-sep (looking-at paragraph-separate))
+(looking-at paragraph-start))
+  (put-text-property (1- (point))
+ (if (looking-at (if adaptive-fill-mode
+ adaptive-fill-regexp "[ 
\t]+"))
+ (match-end 0)
+   (point))
+ 'display visual-fill--space))
+
+;;;###autoload
+(define-minor-mode visual-fill-mode
+  "Auto-refill paragraphs without modifying the buffer."
+  :lighter " VFill"
+  :global nil
+  (jit-lock-unregister #'visual-fill--jit)
+  (with-silent-modifications
+(visual-fill--cleanup (point-min) (point-max)))
+  (when visual-fill-mode
+(jit-lock-register #'visual-fill--jit)))
+
+(provide 'visual-fill)
+;;; visual-fill.el ends here