From ec554d7741d2ff2828ecaa437cc26a6e615f1319 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Mon, 2 May 2016 22:57:06 +0300
Subject: Fix documentation of dired-aux search/replace commands
* lisp/dired-aux.el (dired-do-find-regexp)
(dired-do-find-regexp-and-replace): Doc fixes. (Bug#23429)
* lisp/dired.el: Update the corresponding autoload forms.
---
lisp/dired-aux.el | 7 +++++--
lisp/dired.el | 9 ++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 08db1877f1a..cef4a96b763 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2719,7 +2719,8 @@ with the command \\[tags-loop-continue]."
;;;###autoload
(defun dired-do-find-regexp (regexp)
- "Find all matches for REGEXP in all marked files, recursively."
+ "Find all matches for REGEXP in all marked files.
+For any marked directory, all of its files are searched recursively."
(interactive "sSearch marked files (regexp): ")
(require 'grep)
(defvar grep-find-ignored-files)
@@ -2740,7 +2741,9 @@ with the command \\[tags-loop-continue]."
;;;###autoload
(defun dired-do-find-regexp-and-replace (from to)
- "Replace matches of FROM with TO, in all marked files, recursively."
+ "Replace matches of FROM with TO, in all marked files.
+For any marked directory, matches in all of its files are replaced,
+recursively."
(interactive
(let ((common
(query-replace-read-args
diff --git a/lisp/dired.el b/lisp/dired.el
index ab111bed1b1..41525a45595 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3919,7 +3919,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
;;; Start of automatically extracted autoloads.
-;;;### (autoloads nil "dired-aux" "dired-aux.el" "6b3eb2080834b976621adc041c42f5cc")
+;;;### (autoloads nil "dired-aux" "dired-aux.el" "00fe45cfae47cace47cffc09afca6832")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\
@@ -4423,12 +4423,15 @@ with the command \\[tags-loop-continue].
\(fn FROM TO &optional DELIMITED)" t nil)
(autoload 'dired-do-find-regexp "dired-aux" "\
-Find all matches for REGEXP in all marked files, recursively.
+Find all matches for REGEXP in all marked files.
+For any marked directory, all of its files are searched recursively.
\(fn REGEXP)" t nil)
(autoload 'dired-do-find-regexp-and-replace "dired-aux" "\
-Replace matches of FROM with TO, in all marked files, recursively.
+Replace matches of FROM with TO, in all marked files.
+For any marked directory, matches in all of its files are replaced,
+recursively.
\(fn FROM TO)" t nil)
--
cgit v1.2.1
From 805204f3efdf3e9cb3ccd2783b7ba44f8c1fdb5a Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen
Date: Tue, 3 May 2016 00:02:50 +0200
Subject: Mention what a missing :group does
* doc/lispref/customize.texi (Common Keywords): Document that
a missing :group reuses the group from the preceding item (bug#21601).
---
doc/lispref/customize.texi | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 14e6eb3ab25..de130d57d30 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -66,9 +66,13 @@ cause confusion.}
@kindex group@r{, customization keyword}
@item :group @var{group}
-Put this customization item in group @var{group}. When you use
-@code{:group} in a @code{defgroup}, it makes the new group a subgroup of
-@var{group}.
+Put this customization item in group @var{group}. If this keyword is
+missing from a customization item, it'll be placed in the same group
+as the previous customization item that had a @code{:group} spec (in
+the same file).
+
+When you use @code{:group} in a @code{defgroup}, it makes the new
+group a subgroup of @var{group}.
If you use this keyword more than once, you can put a single item into
more than one group. Displaying any of those groups will show this
--
cgit v1.2.1
From 8544b9879c652e7c700652a4ba6fd17245163bd4 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen
Date: Tue, 3 May 2016 00:08:31 +0200
Subject: posnp doc clarification
* lisp/subr.el (posnp): Mention that a posn object is returned
from `event-start' (bug#18211).
---
lisp/subr.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/lisp/subr.el b/lisp/subr.el
index 3f5d6e427e9..0f021701e9f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1117,6 +1117,7 @@ The return value is a positive integer."
(defun posnp (obj)
"Return non-nil if OBJ appears to be a valid `posn' object specifying a window.
+A `posn' object is returned from functions such as `event-start'.
If OBJ is a valid `posn' object, but specifies a frame rather
than a window, return nil."
;; FIXME: Correct the behavior of this function so that all valid
--
cgit v1.2.1
From 2ea2a2f1a5b5b2e1b20f1ee8c86058334d0a2652 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Tue, 3 May 2016 08:02:16 -0700
Subject: Doc fixes for quoting
* doc/emacs/text.texi, doc/lispintro/emacs-lisp-intro.texi:
* doc/lispref/control.texi, doc/lispref/display.texi:
* doc/lispref/help.texi, doc/lispref/strings.texi, lisp/subr.el:
* src/callint.c, src/doprnt.c, src/editfns.c:
Document quoting a bit more systematically.
Problem reported by Alan Mackenzie (Bug#23425).
---
doc/emacs/text.texi | 4 ++--
doc/lispintro/emacs-lisp-intro.texi | 28 +++++++++++-----------------
doc/lispref/control.texi | 10 ++++++----
doc/lispref/display.texi | 10 ++++++----
doc/lispref/help.texi | 4 ++++
doc/lispref/strings.texi | 10 ++++++++--
lisp/subr.el | 14 ++++++++++----
src/callint.c | 2 +-
src/doprnt.c | 6 +++---
src/editfns.c | 13 ++++++++-----
10 files changed, 59 insertions(+), 42 deletions(-)
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 66f01b495d1..579f7880cfe 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -862,8 +862,8 @@ indenting the current line. @xref{Indentation}, for details.
Text mode turns off the features concerned with comments except when
you explicitly invoke them. It changes the syntax table so that
-single-quotes are considered part of words (e.g., @samp{don't} is
-considered one word). However, if a word starts with a single-quote,
+apostrophes are considered part of words (e.g., @samp{don't} is
+considered one word). However, if a word starts with an apostrophe,
it is treated as a prefix for the purposes of capitalization
(e.g., @kbd{M-c} converts @samp{'hello'} into @samp{'Hello'}, as
expected).
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 78c1865703e..eea46af6b19 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1004,11 +1004,11 @@ the name stands for ``Lots of Isolated Silly Parentheses''. But the
claim is unwarranted. Lisp stands for LISt Processing, and the
programming language handles @emph{lists} (and lists of lists) by
putting them between parentheses. The parentheses mark the boundaries
-of the list. Sometimes a list is preceded by a single apostrophe or
-quotation mark, @samp{'}@footnote{The single apostrophe or quotation
-mark is an abbreviation for the function @code{quote}; you need not
-think about functions now; functions are defined in @ref{Making
-Errors, , Generate an Error Message}.} Lists are the basis of Lisp.
+of the list. Sometimes a list is preceded by an apostrophe @samp{'},
+called a @dfn{single-quote} in Lisp.@footnote{A single-quote is an
+abbreviation for the special form @code{quote}; you need not think
+about special forms now. @xref{Complications}.} Lists are the basis
+of Lisp.
@menu
* Lisp Lists:: What are lists?
@@ -2490,14 +2490,7 @@ in the list and then at the function definition bound to that symbol.
Then the instructions in the function definition are carried out.
@item
-A single quotation mark,
-@ifinfo
-'
-@end ifinfo
-@ifnotinfo
-@code{'}
-@end ifnotinfo
-, tells the Lisp interpreter that it should
+A single-quote @samp{'} tells the Lisp interpreter that it should
return the following expression as written, and not evaluate it as it
would if the quote were not there.
@@ -7610,7 +7603,8 @@ displays in which grave accent and apostrophe were often mirror images
suitable for use as quotes. On most modern displays this is no longer
true, and when these two ASCII characters appear in documentation
strings or diagnostic message formats, Emacs typically transliterates
-them to curved single quotes, so that the abovequoted symbol appears
+them to @dfn{curved quotes} (left and right single quotation marks),
+so that the abovequoted symbol appears
as @t{‘case-fold-search’}. Source-code strings can also simply use
curved quotes directly.
@@ -17117,7 +17111,7 @@ This line is a short, but complete Emacs Lisp expression.
We are already familiar with @code{setq}. It sets the following variable,
@code{major-mode}, to the subsequent value, which is @code{text-mode}.
-The single quote mark before @code{text-mode} tells Emacs to deal directly
+The single-quote before @code{text-mode} tells Emacs to deal directly
with the @code{text-mode} symbol, not with whatever it might stand for.
@xref{set & setq, , Setting the Value of a Variable},
for a reminder of how @code{setq} works.
@@ -17284,11 +17278,11 @@ Rebinding Keys in Your Init File, emacs, The GNU Emacs Manual}, for
details.)
The command invoked by the keys is @code{compare-windows}. Note that
-@code{compare-windows} is preceded by a single quote; otherwise, Emacs
+@code{compare-windows} is preceded by a single-quote; otherwise, Emacs
would first try to evaluate the symbol to determine its value.
These three things, the double quotation marks, the backslash before
-the @samp{C}, and the single quote mark are necessary parts of
+the @samp{C}, and the single-quote are necessary parts of
keybinding that I tend to forget. Fortunately, I have come to
remember that I should look at my existing @file{.emacs} file, and
adapt what is there.
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 3f48c458c02..75d8d284623 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1100,10 +1100,12 @@ These examples show typical uses of @code{error}:
error symbol @code{error}, and a list containing the string returned by
@code{format-message}.
-In a format string containing single quotes, curved quotes @t{‘like
-this’} and grave quotes @t{`like this'} work better than straight
-quotes @t{'like this'}, as @code{error} typically formats every
-straight quote as a curved closing quote.
+A format that quotes with grave accents and apostrophes @t{`like
+this'} typically generates curved quotes @t{‘like this’}. In
+contrast, a format that quotes with only apostrophes @t{'like this'}
+typically generates two closing curved quotes @t{’like this’}, an
+unusual style in English. @xref{Keys in Documentation}, for how the
+@code{text-quoting-style} variable affects generated quotes.
@strong{Warning:} If you want to use your own string as an error message
verbatim, don't just write @code{(error @var{string})}. If @var{string}
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index c80f78c0e3b..b0cd8731fe2 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -265,10 +265,12 @@ properties, it is displayed with the specified faces (@pxref{Faces}).
The string is also added to the @file{*Messages*} buffer, but without
text properties (@pxref{Logging Messages}).
-In a format string containing single quotes, curved quotes @t{‘like
-this’} and grave quotes @t{`like this'} work better than straight
-quotes @t{'like this'}, as @code{message} typically formats every
-straight quote as a curved closing quote.
+A format that quotes with grave accents and apostrophes @t{`like
+this'} typically generates curved quotes @t{‘like this’}. In
+contrast, a format that quotes with only apostrophes @t{'like this'}
+typically generates two closing curved quotes @t{’like this’}, an
+unusual style in English. @xref{Keys in Documentation}, for how the
+@code{text-quoting-style} variable affects generated quotes.
In batch mode, the message is printed to the standard error stream,
followed by a newline.
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index 58a11f29a4c..b945e438f55 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -335,10 +335,14 @@ specifies @var{mapvar}'s value as the keymap for any following
@item ‘
@itemx `
(left single quotation mark and grave accent) both stand for a left quote.
+This generates a left single quotation mark, an apostrophe, or a grave
+accent depending on the value of @code{text-quoting-style}.
@item ’
@itemx '
(right single quotation mark and apostrophe) both stand for a right quote.
+This generates a right single quotation mark or an apostrophe
+depending on the value of @code{text-quoting-style}.
@item \=
quotes the following character and is discarded; thus, @samp{\=`} puts
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 9d6613c522c..c6563f7e03c 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -834,8 +834,14 @@ if any.
This function acts like @code{format}, except it also converts any
curved single quotes in @var{string} as per the value of
@code{text-quoting-style}, and treats grave accent (@t{`}) and
-apostrophe (@t{'}) as if they were curved single quotes. @xref{Keys
-in Documentation}.
+apostrophe (@t{'}) as if they were curved single quotes.
+
+A format that quotes with grave accents and apostrophes @t{`like
+this'} typically generates curved quotes @t{‘like this’}. In
+contrast, a format that quotes with only apostrophes @t{'like this'}
+typically generates two closing curved quotes @t{’like this’}, an
+unusual style in English. @xref{Keys in Documentation}, for how the
+@code{text-quoting-style} variable affects generated quotes.
@end defun
@cindex @samp{%} in format
diff --git a/lisp/subr.el b/lisp/subr.el
index 0f021701e9f..3ac61f9a45f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -290,21 +290,27 @@ This function accepts any number of arguments, but ignores them."
;; Signal a compile-error if the first arg is missing.
(defun error (&rest args)
- "Signal an error, making error message by passing all args to `format'.
+ "Signal an error, making a message by passing args to `format-message'.
In Emacs, the convention is that error messages start with a capital
letter but *do not* end with a period. Please follow this convention
-for the sake of consistency."
+for the sake of consistency.
+
+Note: (error \"%s\" VALUE) makes the message VALUE without
+interpreting format characters like `%', `\\=`', and `\\=''."
(declare (advertised-calling-convention (string &rest args) "23.1"))
(signal 'error (list (apply #'format-message args))))
(defun user-error (format &rest args)
- "Signal a pilot error, making error message by passing all args to `format'.
+ "Signal a pilot error, making a message by passing args to `format-message'.
In Emacs, the convention is that error messages start with a capital
letter but *do not* end with a period. Please follow this convention
for the sake of consistency.
This is just like `error' except that `user-error's are expected to be the
result of an incorrect manipulation on the part of the user, rather than the
-result of an actual problem."
+result of an actual problem.
+
+Note: (user-error \"%s\" VALUE) makes the message VALUE without
+interpreting format characters like `%', `\\=`', and `\\=''."
(signal 'user-error (list (apply #'format-message format args))))
(defun define-error (name message &optional parent)
diff --git a/src/callint.c b/src/callint.c
index e56f7cd1b84..053ee6cdaa5 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -272,7 +272,7 @@ invoke it. If KEYS is omitted or nil, the return value of
{
/* `args' will contain the array of arguments to pass to the function.
`visargs' will contain the same list but in a nicer form, so that if we
- pass it to `Fformat' it will be understandable to a human. */
+ pass it to `Fformat_message' it will be understandable to a human. */
Lisp_Object *args, *visargs;
Lisp_Object specs;
Lisp_Object filter_specs;
diff --git a/src/doprnt.c b/src/doprnt.c
index 506bbc3df35..9d8b783565f 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -46,15 +46,15 @@ along with GNU Emacs. If not, see . */
ignored %s and %c conversions. (See below for the detailed documentation of
what is supported.) However, this is okay, as this function is supposed to
be called from `error' and similar functions, and thus does not need to
- support features beyond those in `Fformat', which is used by `error' on the
- Lisp level. */
+ support features beyond those in `Fformat_message', which is used
+ by `error' on the Lisp level. */
/* In the FORMAT argument this function supports ` and ' as directives
that output left and right quotes as per ‘text-quoting style’. It
also supports the following %-sequences:
%s means print a string argument.
- %S is silently treated as %s, for loose compatibility with `Fformat'.
+ %S is treated as %s, for loose compatibility with `Fformat_message'.
%d means print a `signed int' argument in decimal.
%o means print an `unsigned int' argument in octal.
%x means print an `unsigned int' argument in hex.
diff --git a/src/editfns.c b/src/editfns.c
index f0ce4e7cf34..a858e6e79dd 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3665,10 +3665,11 @@ In batch mode, the message is printed to the standard error stream,
followed by a newline.
The first argument is a format control string, and the rest are data
-to be formatted under control of the string. See `format' for details.
+to be formatted under control of the string. See `format-message' for
+details.
-Note: Use (message "%s" VALUE) to print the value of expressions and
-variables to avoid accidentally interpreting `%' as format specifiers.
+Note: (message "%s" VALUE) displays the string VALUE without
+interpreting format characters like `%', `\\=`', and `\\=''.
If the first argument is nil or the empty string, the function clears
any existing message; this lets the minibuffer contents show. See
@@ -3696,7 +3697,8 @@ DEFUN ("message-box", Fmessage_box, Smessage_box, 1, MANY, 0,
doc: /* Display a message, in a dialog box if possible.
If a dialog box is not available, use the echo area.
The first argument is a format control string, and the rest are data
-to be formatted under control of the string. See `format' for details.
+to be formatted under control of the string. See `format-message' for
+details.
If the first argument is nil or the empty string, clear any existing
message; let the minibuffer contents show.
@@ -3727,7 +3729,8 @@ If this command was invoked with the mouse, use a dialog box if
`use-dialog-box' is non-nil.
Otherwise, use the echo area.
The first argument is a format control string, and the rest are data
-to be formatted under control of the string. See `format' for details.
+to be formatted under control of the string. See `format-message' for
+details.
If the first argument is nil or the empty string, clear any existing
message; let the minibuffer contents show.
--
cgit v1.2.1
From 79e58003aa91ea1273f2588c3891a6ad9c5d282e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Tue, 3 May 2016 19:14:31 +0300
Subject: Improve documentation of Dired's 'A' and 'Q' commands
* lisp/dired-aux.el (dired-do-find-regexp)
(dired-do-find-regexp-and-replace): Mention
'grep-find-ignored-files' and 'vc-directory-exclusion-list', and
also the fact that REGEXP should be palatable by Grep. (Bug#23426)
* lisp/dired.el: Update the corresponding autoload forms.
* doc/emacs/dired.texi (Operating on Files): Mention
'grep-find-ignored-files' and 'vc-directory-exclusion-list'.
(Bug#23429)
---
doc/emacs/dired.texi | 14 ++++++++++++++
lisp/dired-aux.el | 13 +++++++++++--
lisp/dired.el | 11 ++++++++++-
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 089b1091618..aa717dfad54 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -795,6 +795,14 @@ This command is a variant of @code{xref-find-references}
where you can navigate between matches and display them as needed
using the commands described in @ref{Xref Commands}.
+@vindex grep-find-ignored-files @r{(Dired)}
+@vindex vc-directory-exclusion-list @r{(Dired)}
+If any of the marked files are directories, then this command searches
+all of the files in those directories, and any of their
+subdirectories, recursively, except files whose names match
+@code{grep-find-ignored-files} and subdirectories whose names match
+@code{vc-directory-exclusion-list}.
+
@kindex Q @r{(Dired)}
@findex dired-do-find-regexp-and-replace
@cindex search and replace in multiple files (in Dired)
@@ -809,6 +817,12 @@ and you can use the special commands in that buffer (@pxref{Xref
Commands}). In particular, if you exit the query replace loop, you
can use @kbd{r} in that buffer to replace more matches.
@xref{Identifier Search}.
+
+Like with @code{dired-do-find-regexp}, if any of the marked files are
+directories, this command performs replacements in all of the files in
+those directories, and in any of their subdirectories, recursively,
+except for files whose names match @code{grep-find-ignored-files} and
+subdirectories whose names match @code{vc-directory-exclusion-list}.
@end table
@node Shell Commands in Dired
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index cef4a96b763..5ee3c118cb1 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2720,7 +2720,12 @@ with the command \\[tags-loop-continue]."
;;;###autoload
(defun dired-do-find-regexp (regexp)
"Find all matches for REGEXP in all marked files.
-For any marked directory, all of its files are searched recursively."
+For any marked directory, all of its files are searched recursively.
+However, files matching `grep-find-ignored-files' and subdirectories
+matching `vc-directory-exclusion-list' are skipped in the marked
+directories.
+
+REGEXP should use constructs supported by your local `grep' command."
(interactive "sSearch marked files (regexp): ")
(require 'grep)
(defvar grep-find-ignored-files)
@@ -2743,7 +2748,11 @@ For any marked directory, all of its files are searched recursively."
(defun dired-do-find-regexp-and-replace (from to)
"Replace matches of FROM with TO, in all marked files.
For any marked directory, matches in all of its files are replaced,
-recursively."
+recursively. However, files matching `grep-find-ignored-files'
+and subdirectories matching `vc-directory-exclusion-list' are skipped
+in the marked directories.
+
+REGEXP should use constructs supported by your local `grep' command."
(interactive
(let ((common
(query-replace-read-args
diff --git a/lisp/dired.el b/lisp/dired.el
index 41525a45595..2cc3c88dbc0 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4425,13 +4425,22 @@ with the command \\[tags-loop-continue].
(autoload 'dired-do-find-regexp "dired-aux" "\
Find all matches for REGEXP in all marked files.
For any marked directory, all of its files are searched recursively.
+However, files matching `grep-find-ignored-files' and subdirectories
+matching `vc-directory-exclusion-list' are skipped in the marked
+directories.
+
+REGEXP should use constructs supported by your local `grep' command.
\(fn REGEXP)" t nil)
(autoload 'dired-do-find-regexp-and-replace "dired-aux" "\
Replace matches of FROM with TO, in all marked files.
For any marked directory, matches in all of its files are replaced,
-recursively.
+recursively. However, files matching `grep-find-ignored-files'
+and subdirectories matching `vc-directory-exclusion-list' are skipped
+in the marked directories.
+
+REGEXP should use constructs supported by your local `grep' command.
\(fn FROM TO)" t nil)
--
cgit v1.2.1
From 93703c547a96bc257d4e4c1ae4c84e60cf217810 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen
Date: Tue, 3 May 2016 19:06:13 +0200
Subject: (Common Keywords): Correct what missing :group means
* doc/lispref/customize.texi (Common Keywords): Correct what
missing :group means.
---
doc/lispref/customize.texi | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index de130d57d30..4a6f7f2162b 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -68,8 +68,7 @@ cause confusion.}
@item :group @var{group}
Put this customization item in group @var{group}. If this keyword is
missing from a customization item, it'll be placed in the same group
-as the previous customization item that had a @code{:group} spec (in
-the same file).
+that was last defined (in the current file).
When you use @code{:group} in a @code{defgroup}, it makes the new
group a subgroup of @var{group}.
--
cgit v1.2.1
From 52f86a755b0befb6ad2a26bdb4edc46e2152b593 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Tue, 3 May 2016 13:30:21 -0700
Subject: * etc/NEWS: Mention (message "%s" (format ...)).
---
etc/NEWS | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/etc/NEWS b/etc/NEWS
index b5d2b44d39f..21ebba5933a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1487,7 +1487,8 @@ before, characters preceded by \= are output as-is.
They use the new 'format-message' function instead of plain 'format',
so that they now follow user preference as per 'text-quoting-style'
when processing curved single quotes, grave accents, and apostrophes
-in their format argument.
+in their format argument. To process % directives but not quotes, you
+can use calls like (message "%s" (format FORMAT ARG1 ... ARGn)).
+++
** The character classes [:alpha:] and [:alnum:] in regular expressions
--
cgit v1.2.1
From c68a09107c1f7459c626d38be5e0e991912e57ec Mon Sep 17 00:00:00 2001
From: Alan Mackenzie
Date: Tue, 3 May 2016 20:27:48 +0000
Subject: Note the quote translation in `message' in section "incompatible
changes".
* etc/NEWS: Note that `message' translates quotes, that the translation
cannot be disabled, and that `format' can be used to get the old
behavior back.
---
etc/NEWS | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/etc/NEWS b/etc/NEWS
index 21ebba5933a..dbc2944fb68 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1475,6 +1475,13 @@ displayable, and like 'grave' otherwise. The new variable affects
display of diagnostics and help, but not of info. As the variable is
not intended for casual use, it is not a user option.
++++
+** `message' now translates various sorts of single quotes in its
+format string according to the value of `text-quoting-style' (see
+above). This translation cannot be disabled. To get the old
+behavior of `message', use `format', which is not affected by
+`text-quoting-style', e.g. (message "%s" (format "...." foo bar)).
+
+++
** substitute-command-keys now replaces quotes.
That is, it converts documentation strings' quoting style as per the
--
cgit v1.2.1
From 6f82d8ef7d3aea2d05677d2792f89b8e6084d66a Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Wed, 4 May 2016 00:42:43 +0300
Subject: Clear buffer-undo-list when showing xrefs
* lisp/progmodes/xref.el (xref--show-xref-buffer): Clear
buffer-undo-list and temporarily bind it to t while rendering the
buffer contents.
---
lisp/progmodes/xref.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index b5632af13ab..540c7b0e925 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -687,7 +687,9 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)."
(defun xref--show-xref-buffer (xrefs alist)
(let ((xref-alist (xref--analyze xrefs)))
(with-current-buffer (get-buffer-create xref-buffer-name)
- (let ((inhibit-read-only t))
+ (setq buffer-undo-list nil)
+ (let ((inhibit-read-only t)
+ (buffer-undo-list t))
(erase-buffer)
(xref--insert-xrefs xref-alist)
(xref--xref-buffer-mode)
--
cgit v1.2.1
From 6428aa044ad872e9b8b60d825b7cbcb38ae3e492 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Wed, 4 May 2016 01:02:43 +0300
Subject: Use grep-find-ignored-directories instead of
vc-directory-exclusion-list
* lisp/dired-aux.el (dired-do-find-regexp):
Use grep-find-ignored-directories instead of
vc-directory-exclusion-list. The result should be functionally
similar (the former uses the latter as the default value), but it
should be more consistent and appropriate WRT user
customizations.
(dired-do-find-regexp-and-replace): Update the docstring.
* lisp/dired.el: Update the corresponding autoloads.
* doc/emacs/dired.texi (Operating on Files): Update the
documentation accordingly.
---
doc/emacs/dired.texi | 6 +++---
lisp/dired-aux.el | 7 ++++---
lisp/dired.el | 6 +++---
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index aa717dfad54..1b10ebc8758 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -796,12 +796,12 @@ where you can navigate between matches and display them as needed
using the commands described in @ref{Xref Commands}.
@vindex grep-find-ignored-files @r{(Dired)}
-@vindex vc-directory-exclusion-list @r{(Dired)}
+@vindex grep-find-ignored-directories @r{(Dired)}
If any of the marked files are directories, then this command searches
all of the files in those directories, and any of their
subdirectories, recursively, except files whose names match
@code{grep-find-ignored-files} and subdirectories whose names match
-@code{vc-directory-exclusion-list}.
+@code{grep-find-ignored-directories}.
@kindex Q @r{(Dired)}
@findex dired-do-find-regexp-and-replace
@@ -822,7 +822,7 @@ Like with @code{dired-do-find-regexp}, if any of the marked files are
directories, this command performs replacements in all of the files in
those directories, and in any of their subdirectories, recursively,
except for files whose names match @code{grep-find-ignored-files} and
-subdirectories whose names match @code{vc-directory-exclusion-list}.
+subdirectories whose names match @code{grep-find-ignored-directories}.
@end table
@node Shell Commands in Dired
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 5ee3c118cb1..b9111a8d5b4 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2722,17 +2722,18 @@ with the command \\[tags-loop-continue]."
"Find all matches for REGEXP in all marked files.
For any marked directory, all of its files are searched recursively.
However, files matching `grep-find-ignored-files' and subdirectories
-matching `vc-directory-exclusion-list' are skipped in the marked
+matching `grep-find-ignored-directories' are skipped in the marked
directories.
REGEXP should use constructs supported by your local `grep' command."
(interactive "sSearch marked files (regexp): ")
(require 'grep)
(defvar grep-find-ignored-files)
+ (defvar grep-find-ignored-directories)
(let* ((files (dired-get-marked-files))
(ignores (nconc (mapcar
(lambda (s) (concat s "/"))
- vc-directory-exclusion-list)
+ grep-find-ignored-directories)
grep-find-ignored-files))
(xrefs (cl-mapcan
(lambda (file)
@@ -2749,7 +2750,7 @@ REGEXP should use constructs supported by your local `grep' command."
"Replace matches of FROM with TO, in all marked files.
For any marked directory, matches in all of its files are replaced,
recursively. However, files matching `grep-find-ignored-files'
-and subdirectories matching `vc-directory-exclusion-list' are skipped
+and subdirectories matching `grep-find-ignored-directories' are skipped
in the marked directories.
REGEXP should use constructs supported by your local `grep' command."
diff --git a/lisp/dired.el b/lisp/dired.el
index 2cc3c88dbc0..b838e649848 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3919,7 +3919,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
;;; Start of automatically extracted autoloads.
-;;;### (autoloads nil "dired-aux" "dired-aux.el" "00fe45cfae47cace47cffc09afca6832")
+;;;### (autoloads nil "dired-aux" "dired-aux.el" "8346506b9ef7167fd55b5eac7e6617a1")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\
@@ -4426,7 +4426,7 @@ with the command \\[tags-loop-continue].
Find all matches for REGEXP in all marked files.
For any marked directory, all of its files are searched recursively.
However, files matching `grep-find-ignored-files' and subdirectories
-matching `vc-directory-exclusion-list' are skipped in the marked
+matching `grep-find-ignored-directories' are skipped in the marked
directories.
REGEXP should use constructs supported by your local `grep' command.
@@ -4437,7 +4437,7 @@ REGEXP should use constructs supported by your local `grep' command.
Replace matches of FROM with TO, in all marked files.
For any marked directory, matches in all of its files are replaced,
recursively. However, files matching `grep-find-ignored-files'
-and subdirectories matching `vc-directory-exclusion-list' are skipped
+and subdirectories matching `grep-find-ignored-directories' are skipped
in the marked directories.
REGEXP should use constructs supported by your local `grep' command.
--
cgit v1.2.1
From f559b374a30f3615261f7a902fc3428cac6289f4 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Wed, 4 May 2016 01:38:02 +0300
Subject: Add tests for xref-collect-matches
* test/automated/xref-tests.el: New file. Add tests for
xref-collect-matches.
---
test/automated/data/xref/file1.txt | 2 ++
test/automated/data/xref/file2.txt | 2 ++
test/automated/xref-tests.el | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+)
create mode 100644 test/automated/data/xref/file1.txt
create mode 100644 test/automated/data/xref/file2.txt
create mode 100644 test/automated/xref-tests.el
diff --git a/test/automated/data/xref/file1.txt b/test/automated/data/xref/file1.txt
new file mode 100644
index 00000000000..5d7cc544443
--- /dev/null
+++ b/test/automated/data/xref/file1.txt
@@ -0,0 +1,2 @@
+foo foo
+bar
diff --git a/test/automated/data/xref/file2.txt b/test/automated/data/xref/file2.txt
new file mode 100644
index 00000000000..9f075f26004
--- /dev/null
+++ b/test/automated/data/xref/file2.txt
@@ -0,0 +1,2 @@
+
+bar
diff --git a/test/automated/xref-tests.el b/test/automated/xref-tests.el
new file mode 100644
index 00000000000..1b500c3c418
--- /dev/null
+++ b/test/automated/xref-tests.el
@@ -0,0 +1,37 @@
+(require 'xref)
+(require 'cl-lib)
+
+(defvar xref-tests-data-dir
+ (expand-file-name "data/xref/"
+ (file-name-directory (or load-file-name (buffer-file-name)))))
+
+(ert-deftest xref-collect-matches-finds-none-for-some-regexp ()
+ (should (null (xref-collect-matches "zzz" "*" xref-tests-data-dir nil))))
+
+(ert-deftest xref-collect-matches-finds-some-for-bar ()
+ (let* ((matches (xref-collect-matches "bar" "*" xref-tests-data-dir nil))
+ (locs (cl-sort (mapcar #'xref-item-location matches)
+ #'string<
+ :key #'xref-location-group)))
+ (should (= 2 (length matches)))
+ (should (string-match-p "file1\\.txt\\'" (xref-location-group (nth 0 locs))))
+ (should (string-match-p "file2\\.txt\\'" (xref-location-group (nth 1 locs))))))
+
+(ert-deftest xref-collect-matches-finds-two-matches-on-the-same-line ()
+ (let* ((matches (xref-collect-matches "foo" "*" xref-tests-data-dir nil))
+ (locs (mapcar #'xref-item-location matches)))
+ (should (= 2 (length matches)))
+ (should (string-match-p "file1\\.txt\\'" (xref-location-group (nth 0 locs))))
+ (should (string-match-p "file1\\.txt\\'" (xref-location-group (nth 1 locs))))
+ (should (equal 1 (xref-location-line (nth 0 locs))))
+ (should (equal 1 (xref-location-line (nth 1 locs))))
+ (should (equal 0 (xref-file-location-column (nth 0 locs))))
+ (should (equal 4 (xref-file-location-column (nth 1 locs))))))
+
+;; (ert-deftest xref-collect-matches-finds-an-empty-line-regexp-match ()
+;; (let* ((matches (xref-collect-matches "^$" "*" xref-tests-data-dir nil))
+;; (locs (mapcar #'xref-item-location matches)))
+;; (should (= 1 (length matches)))
+;; (should (string-match-p "file2\\.txt\\'" (xref-location-group (nth 0 locs))))
+;; (should (equal 1 (xref-location-line (nth 0 locs))))
+;; (should (equal 0 (xref-file-location-column (nth 0 locs))))))
--
cgit v1.2.1
From 4d8fd9cf338cf9b5dfc613657adfeabff2d9c14e Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Wed, 4 May 2016 01:59:29 +0300
Subject: Handle "empty line" regexp in xref searches
* lisp/progmodes/xref.el (xref--collect-matches-1): Stop after one
match if re-search-forward doesn't move point (bug#23426).
* test/automated/xref-tests.el
(xref-collect-matches-finds-an-empty-line-regexp-match):
Uncomment test.
---
lisp/progmodes/xref.el | 6 +++++-
test/automated/xref-tests.el | 14 +++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 540c7b0e925..62cef235988 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1016,7 +1016,11 @@ directory, used as the root of the ignore globs."
(syntax-propertize line-end)
;; FIXME: This results in several lines with the same
;; summary. Solve with composite pattern?
- (while (re-search-forward regexp line-end t)
+ (while (and
+ ;; REGEXP might match an empty string. Or line.
+ (or (null matches)
+ (> (point) line-beg))
+ (re-search-forward regexp line-end t))
(let* ((beg-column (- (match-beginning 0) line-beg))
(end-column (- (match-end 0) line-beg))
(loc (xref-make-file-location file line beg-column))
diff --git a/test/automated/xref-tests.el b/test/automated/xref-tests.el
index 1b500c3c418..28ca3511c22 100644
--- a/test/automated/xref-tests.el
+++ b/test/automated/xref-tests.el
@@ -28,10 +28,10 @@
(should (equal 0 (xref-file-location-column (nth 0 locs))))
(should (equal 4 (xref-file-location-column (nth 1 locs))))))
-;; (ert-deftest xref-collect-matches-finds-an-empty-line-regexp-match ()
-;; (let* ((matches (xref-collect-matches "^$" "*" xref-tests-data-dir nil))
-;; (locs (mapcar #'xref-item-location matches)))
-;; (should (= 1 (length matches)))
-;; (should (string-match-p "file2\\.txt\\'" (xref-location-group (nth 0 locs))))
-;; (should (equal 1 (xref-location-line (nth 0 locs))))
-;; (should (equal 0 (xref-file-location-column (nth 0 locs))))))
+(ert-deftest xref-collect-matches-finds-an-empty-line-regexp-match ()
+ (let* ((matches (xref-collect-matches "^$" "*" xref-tests-data-dir nil))
+ (locs (mapcar #'xref-item-location matches)))
+ (should (= 1 (length matches)))
+ (should (string-match-p "file2\\.txt\\'" (xref-location-group (nth 0 locs))))
+ (should (equal 1 (xref-location-line (nth 0 locs))))
+ (should (equal 0 (xref-file-location-column (nth 0 locs))))))
--
cgit v1.2.1
From adc80b7e238e09b1b8c392ecf902d2b978d9016d Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Tue, 3 May 2016 19:36:40 -0700
Subject: ; * test/automated/xref-tests.el: Add copyright and license.
---
test/automated/xref-tests.el | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/test/automated/xref-tests.el b/test/automated/xref-tests.el
index 28ca3511c22..b288e2d7584 100644
--- a/test/automated/xref-tests.el
+++ b/test/automated/xref-tests.el
@@ -1,3 +1,28 @@
+;;; xref-tests.el --- tests for xref
+
+;; Copyright (C) 2016 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see .
+
+;;; Commentary:
+
+;;; Code:
+
(require 'xref)
(require 'cl-lib)
--
cgit v1.2.1
From e68ad1f3f08268f0642ba19e7c894f9e05cb8e6f Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Wed, 4 May 2016 13:23:21 -0400
Subject: ; * etc/NEWS: Tiny edit. (Bug#23432)
---
etc/NEWS | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index dbc2944fb68..7d6e5334e5c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1715,9 +1715,11 @@ permissions set to temporary values (e.g., for creating private files).
---
** Function 'system-name' now returns an updated value if the current
-system's name has changed or if the Emacs process has changed systems,
-and to avoid long waits it no longer consults DNS to canonicalize the
-name. The variable 'system-name' is now obsolete.
+system's name has changed or if the Emacs process has changed systems.
+To avoid long waits it no longer consults DNS to canonicalize the name
+(in some cases this may affect generated message-id headers - customize
+'message-user-fqdn' if this bothers you). The variable 'system-name'
+is now obsolete.
+++
** Function 'write-region' no longer outputs "Wrote FILE" in batch mode.
--
cgit v1.2.1
From 0932b948971770201b135d5f0dee82b91a1eef92 Mon Sep 17 00:00:00 2001
From: Stephen Berman
Date: Wed, 4 May 2016 21:52:32 +0200
Subject: Fix todo-mode bug involving archived items (bug#23447)
* lisp/calendar/todo-mode.el (todo-jump-to-category): When jumping
from Todo Categories mode to a category with only archived items
and todo-skip-archived-categories is non-nil, make sure the
archive file buffer is in Todo Archive mode to prevent
todo-category-select from raising an error, and don't set
todo-current-todo-file, since that makes todo-show display the
archived category. Remove a no-op call to kill-buffer, which is
already called in todo-insert-category-line.
---
lisp/calendar/todo-mode.el | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 0529e970333..8e752586053 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -902,17 +902,19 @@ Categories mode."
(todo-show)
(let* ((archive (eq where 'archive))
(cat (unless archive where))
+ (goto-archive (and cat
+ todo-skip-archived-categories
+ (zerop (todo-get-count 'todo cat))
+ (zerop (todo-get-count 'done cat))
+ (not (zerop (todo-get-count 'archived cat)))))
(file0 (when cat ; We're in Todo Categories mode.
- ;; With non-nil `todo-skip-archived-categories'
- ;; jump to archive file of a category with only
- ;; archived items.
- (if (and todo-skip-archived-categories
- (zerop (todo-get-count 'todo cat))
- (zerop (todo-get-count 'done cat))
- (not (zerop (todo-get-count 'archived cat))))
+ (if goto-archive
+ ;; If the category has only archived items and
+ ;; `todo-skip-archived-categories' is non-nil, jump to
+ ;; the archive category.
(concat (file-name-sans-extension
todo-current-todo-file) ".toda")
- ;; Otherwise, jump to current todo file.
+ ;; Otherwise, jump to the category in the todo file.
todo-current-todo-file)))
(len (length todo-categories))
(cat+file (unless cat
@@ -923,18 +925,15 @@ Categories mode."
(category (or cat (car cat+file))))
(unless cat (setq file0 (cdr cat+file)))
(with-current-buffer (find-file-noselect file0 'nowarn)
- (setq todo-current-todo-file file0)
- ;; If called from Todo Categories mode, clean up before jumping.
- (if (string= (buffer-name) todo-categories-buffer)
- (kill-buffer))
- (set-window-buffer (selected-window)
- (set-buffer (find-buffer-visiting file0)))
- (unless todo-global-current-todo-file
- (setq todo-global-current-todo-file todo-current-todo-file))
- (todo-category-number category)
- (todo-category-select)
- (goto-char (point-min))
- (when add-item (todo-insert-item--basic))))))
+ (when goto-archive (todo-archive-mode))
+ (set-window-buffer (selected-window)
+ (set-buffer (find-buffer-visiting file0)))
+ (unless todo-global-current-todo-file
+ (setq todo-global-current-todo-file todo-current-todo-file))
+ (todo-category-number category)
+ (todo-category-select)
+ (goto-char (point-min))
+ (when add-item (todo-insert-item--basic))))))
(defun todo-next-item (&optional count)
"Move point down to the beginning of the next item.
--
cgit v1.2.1
From 3fe351072841becbb1902c19f784890949f41c1d Mon Sep 17 00:00:00 2001
From: Juri Linkov
Date: Wed, 4 May 2016 23:05:33 +0300
Subject: * lisp/replace.el (query-replace-read-from): Use
minibuffer-with-setup-hook
to set minibuffer-local value of text-property-default-nonsticky.
(Bug#23418, bug#23127)
---
lisp/replace.el | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/lisp/replace.el b/lisp/replace.el
index 801c6058f74..26e5875dc08 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -191,18 +191,15 @@ wants to replace FROM with TO."
;; a region in order to specify the minibuffer input.
;; That should not clobber the region for the query-replace itself.
(save-excursion
- ;; The `with-current-buffer' ensures that the binding
- ;; for `text-property-default-nonsticky' isn't a buffer
- ;; local binding in the current buffer, which
- ;; `read-from-minibuffer' wouldn't see.
- (with-current-buffer (window-buffer (minibuffer-window))
- (let ((text-property-default-nonsticky
- (cons '(separator . t) text-property-default-nonsticky)))
- (if regexp-flag
- (read-regexp prompt nil 'query-replace-from-to-history)
- (read-from-minibuffer
- prompt nil nil nil 'query-replace-from-to-history
- (car (if regexp-flag regexp-search-ring search-ring)) t))))))
+ (minibuffer-with-setup-hook
+ (lambda ()
+ (setq-local text-property-default-nonsticky
+ (cons '(separator . t) text-property-default-nonsticky)))
+ (if regexp-flag
+ (read-regexp prompt nil 'query-replace-from-to-history)
+ (read-from-minibuffer
+ prompt nil nil nil 'query-replace-from-to-history
+ (car (if regexp-flag regexp-search-ring search-ring)) t)))))
(to))
(if (and (zerop (length from)) query-replace-defaults)
(cons (caar query-replace-defaults)
--
cgit v1.2.1
From 922c7a3e48e649ad67bd12b1f83343b730dd1bc4 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Thu, 5 May 2016 02:52:34 +0300
Subject: Rework xref-query-replace-in-results
* lisp/progmodes/xref.el (xref-query-replace-in-results): Collect
all xrefs from the buffer first, then delegate most of the
processing to the value returned by xref--buf-pairs-iterator.
(xref--buf-pairs-iterator): New function. Return an "iterator"
which partitions returned markers into buffers, and only processes
markers from one buffer at a time. When an xref is out of date,
skip it with a message instead of signaling error (bug#23284).
(xref--outdated-p): Extract from xref--buf-pairs-iterator. Trim
CR from both strings before comparing.
(xref--query-replace-1): Remove the variable current-buf, no need
to track it anymore. Simplify the filter-predicate and search
functions accordingly. Iterate over buffer-markers pairs returned
by the iterator, and call `perform-replace' for each of them. Use
multi-query-replace-map (bug#23284). Use `switch-to-buffer' every
time after the first, in order not to jump between windows.
* test/automated/xref-tests.el
(xref--buf-pairs-iterator-groups-markers-by-buffers-1)
(xref--buf-pairs-iterator-groups-markers-by-buffers-2)
(xref--buf-pairs-iterator-cleans-up-markers): New tests.
---
lisp/progmodes/xref.el | 131 ++++++++++++++++++++++++++-----------------
test/automated/xref-tests.el | 29 ++++++++++
2 files changed, 110 insertions(+), 50 deletions(-)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 62cef235988..17bfdb69f8f 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -521,58 +521,86 @@ references displayed in the current *xref* buffer."
(let ((fr (read-regexp "Xref query-replace (regexp)" ".*")))
(list fr
(read-regexp (format "Xref query-replace (regexp) %s with: " fr)))))
- (let ((reporter (make-progress-reporter (format "Saving search results...")
- 0 (line-number-at-pos (point-max))))
- (counter 0)
- pairs item)
+ (let* (item xrefs iter)
+ (save-excursion
+ (while (setq item (xref--search-property 'xref-item))
+ (when (xref-match-length item)
+ (push item xrefs))))
(unwind-protect
(progn
- (save-excursion
- (goto-char (point-min))
- ;; TODO: This list should be computed on-demand instead.
- ;; As long as the UI just iterates through matches one by
- ;; one, there's no need to compute them all in advance.
- ;; Then we can throw away the reporter.
- (while (setq item (xref--search-property 'xref-item))
- (when (xref-match-length item)
- (save-excursion
- (let* ((loc (xref-item-location item))
- (beg (xref-location-marker loc))
- (end (move-marker (make-marker)
- (+ beg (xref-match-length item))
- (marker-buffer beg))))
- ;; Perform sanity check first.
- (xref--goto-location loc)
- ;; FIXME: The check should probably be a generic
- ;; function, instead of the assumption that all
- ;; matches contain the full line as summary.
- ;; TODO: Offer to re-scan otherwise.
- (unless (equal (buffer-substring-no-properties
- (line-beginning-position)
- (line-end-position))
- (xref-item-summary item))
- (user-error "Search results out of date"))
- (progress-reporter-update reporter (cl-incf counter))
- (push (cons beg end) pairs)))))
- (setq pairs (nreverse pairs)))
- (unless pairs (user-error "No suitable matches here"))
- (progress-reporter-done reporter)
- (xref--query-replace-1 from to pairs))
- (dolist (pair pairs)
- (move-marker (car pair) nil)
- (move-marker (cdr pair) nil)))))
+ (goto-char (point-min))
+ (setq iter (xref--buf-pairs-iterator (nreverse xrefs)))
+ (xref--query-replace-1 from to iter))
+ (funcall iter :cleanup))))
+
+(defun xref--buf-pairs-iterator (xrefs)
+ (let (chunk-done item next-pair file-buf pairs all-pairs)
+ (lambda (action)
+ (pcase action
+ (:next
+ (when (or xrefs next-pair)
+ (setq chunk-done nil)
+ (when next-pair
+ (setq file-buf (marker-buffer (car next-pair))
+ pairs (list next-pair)
+ next-pair nil))
+ (while (and (not chunk-done)
+ (setq item (pop xrefs)))
+ (save-excursion
+ (let* ((loc (xref-item-location item))
+ (beg (xref-location-marker loc))
+ (end (move-marker (make-marker)
+ (+ beg (xref-match-length item))
+ (marker-buffer beg))))
+ (let ((pair (cons beg end)))
+ (push pair all-pairs)
+ ;; Perform sanity check first.
+ (xref--goto-location loc)
+ (if (xref--outdated-p item
+ (buffer-substring-no-properties
+ (line-beginning-position)
+ (line-end-position)))
+ (message "Search result out of date, skipping")
+ (cond
+ ((null file-buf)
+ (setq file-buf (marker-buffer beg))
+ (push pair pairs))
+ ((equal file-buf (marker-buffer beg))
+ (push pair pairs))
+ (t
+ (setq chunk-done t
+ next-pair pair))))))))
+ (cons file-buf pairs)))
+ (:cleanup
+ (dolist (pair all-pairs)
+ (move-marker (car pair) nil)
+ (move-marker (cdr pair) nil)))))))
+
+(defun xref--outdated-p (item line-text)
+ ;; FIXME: The check should probably be a generic function instead of
+ ;; the assumption that all matches contain the full line as summary.
+ (let ((summary (xref-item-summary item))
+ (strip (lambda (s) (if (string-match "\r\\'" s)
+ (substring-no-properties s 0 -1)
+ s))))
+ (not
+ ;; Sometimes buffer contents include ^M, and sometimes Grep
+ ;; output includes it, and they don't always match.
+ (equal (funcall strip line-text)
+ (funcall strip summary)))))
;; FIXME: Write a nicer UI.
-(defun xref--query-replace-1 (from to pairs)
+(defun xref--query-replace-1 (from to iter)
(let* ((query-replace-lazy-highlight nil)
- current-beg current-end current-buf
+ (continue t)
+ did-it-once buf-pairs pairs
+ current-beg current-end
;; Counteract the "do the next match now" hack in
;; `perform-replace'. And still, it'll report that those
;; matches were "filtered out" at the end.
(isearch-filter-predicate
(lambda (beg end)
(and current-beg
- (eq (current-buffer) current-buf)
(>= beg current-beg)
(<= end current-end))))
(replace-re-search-function
@@ -581,19 +609,22 @@ references displayed in the current *xref* buffer."
(while (and (not found) pairs)
(setq pair (pop pairs)
current-beg (car pair)
- current-end (cdr pair)
- current-buf (marker-buffer current-beg))
- (xref--with-dedicated-window
- (pop-to-buffer current-buf))
+ current-end (cdr pair))
(goto-char current-beg)
(when (re-search-forward from current-end noerror)
(setq found t)))
found))))
- ;; FIXME: Despite this being a multi-buffer replacement, `N'
- ;; doesn't work, because we're not using
- ;; `multi-query-replace-map', and it would expect the below
- ;; function to be called once per buffer.
- (perform-replace from to t t nil)))
+ (while (and continue (setq buf-pairs (funcall iter :next)))
+ (if did-it-once
+ ;; Reuse the same window for subsequent buffers.
+ (switch-to-buffer (car buf-pairs))
+ (xref--with-dedicated-window
+ (pop-to-buffer (car buf-pairs)))
+ (setq did-it-once t))
+ (setq pairs (cdr buf-pairs))
+ (setq continue
+ (perform-replace from to t t nil nil multi-query-replace-map)))
+ (unless did-it-once (user-error "No suitable matches here"))))
(defvar xref--xref-buffer-mode-map
(let ((map (make-sparse-keymap)))
diff --git a/test/automated/xref-tests.el b/test/automated/xref-tests.el
index b288e2d7584..079b196aa8b 100644
--- a/test/automated/xref-tests.el
+++ b/test/automated/xref-tests.el
@@ -60,3 +60,32 @@
(should (string-match-p "file2\\.txt\\'" (xref-location-group (nth 0 locs))))
(should (equal 1 (xref-location-line (nth 0 locs))))
(should (equal 0 (xref-file-location-column (nth 0 locs))))))
+
+(ert-deftest xref--buf-pairs-iterator-groups-markers-by-buffers-1 ()
+ (let* ((xrefs (xref-collect-matches "foo" "*" xref-tests-data-dir nil))
+ (iter (xref--buf-pairs-iterator xrefs))
+ (cons (funcall iter :next)))
+ (should (null (funcall iter :next)))
+ (should (string-match "file1\\.txt\\'" (buffer-file-name (car cons))))
+ (should (= 2 (length (cdr cons))))))
+
+(ert-deftest xref--buf-pairs-iterator-groups-markers-by-buffers-2 ()
+ (let* ((xrefs (xref-collect-matches "bar" "*" xref-tests-data-dir nil))
+ (iter (xref--buf-pairs-iterator xrefs))
+ (cons1 (funcall iter :next))
+ (cons2 (funcall iter :next)))
+ (should (null (funcall iter :next)))
+ (should-not (equal (car cons1) (car cons2)))
+ (should (= 1 (length (cdr cons1))))
+ (should (= 1 (length (cdr cons2))))))
+
+(ert-deftest xref--buf-pairs-iterator-cleans-up-markers ()
+ (let* ((xrefs (xref-collect-matches "bar" "*" xref-tests-data-dir nil))
+ (iter (xref--buf-pairs-iterator xrefs))
+ (cons1 (funcall iter :next))
+ (cons2 (funcall iter :next)))
+ (funcall iter :cleanup)
+ (should (null (marker-position (car (nth 0 (cdr cons1))))))
+ (should (null (marker-position (cdr (nth 0 (cdr cons1))))))
+ (should (null (marker-position (car (nth 0 (cdr cons2))))))
+ (should (null (marker-position (cdr (nth 0 (cdr cons2))))))))
--
cgit v1.2.1
From ab3ba912fc7b91b7b147ea36fabe461dc99a9fb8 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Thu, 5 May 2016 04:15:23 +0300
Subject: shell-quote-argument DIR when appropriate
* lisp/progmodes/project.el (project-file-completion-table):
`shell-quote-argument' DIR as well.
* lisp/progmodes/xref.el (xref--rgrep-command): Pass DIR through
`shell-quote-argument' (bug#23453). Thanks for Kaushal Modi for
pointing out the problem. Assert that DIR doesn't start with `~'.
---
lisp/progmodes/project.el | 3 ++-
lisp/progmodes/xref.el | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 9c8a88c80fc..a51c383b93b 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -172,7 +172,8 @@ to find the list of ignores for each directory."
(let ((command
(format "%s %s %s -type f -print0"
find-program
- dir
+ (shell-quote-argument
+ (expand-file-name dir))
(xref--find-ignores-arguments
(project-ignores project dir)
(expand-file-name dir)))))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 17bfdb69f8f..1c28390258c 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -941,6 +941,8 @@ IGNORES is a list of glob patterns."
(require 'find-dired) ; for `find-name-arg'
(defvar grep-find-template)
(defvar find-name-arg)
+ ;; `shell-quote-argument' quotes the tilde as well.
+ (cl-assert (not (string-match-p "\\`~" dir)))
(grep-expand-template
grep-find-template
regexp
@@ -952,14 +954,13 @@ IGNORES is a list of glob patterns."
(concat " -o " find-name-arg " "))
" "
(shell-quote-argument ")"))
- dir
+ (shell-quote-argument dir)
(xref--find-ignores-arguments ignores dir)))
(defun xref--find-ignores-arguments (ignores dir)
"Convert IGNORES and DIR to a list of arguments for 'find'.
IGNORES is a list of glob patterns. DIR is an absolute
directory, used as the root of the ignore globs."
- ;; `shell-quote-argument' quotes the tilde as well.
(cl-assert (not (string-match-p "\\`~" dir)))
(when ignores
(concat
--
cgit v1.2.1
From 1a4127dbd625ea64f535b3bd09844a99161290a6 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Thu, 5 May 2016 04:28:14 +0300
Subject: Use save-excursion in xref-location-marker more
* lisp/progmodes/elisp-mode.el (xref-location-marker): Use
save-excursion, in order not to alter the value of point if the
buffer is currently open in the background (problem reported by
Robert Weiner).
* lisp/progmodes/etags.el (xref-location-marker): Same.
---
lisp/progmodes/elisp-mode.el | 5 +++--
lisp/progmodes/etags.el | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index fc4501d0cbe..6c6c3803f9e 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -826,8 +826,9 @@ non-nil result supercedes the xrefs produced by
(pcase-let (((cl-struct xref-elisp-location symbol type file) l))
(let ((buffer-point (find-function-search-for-symbol symbol type file)))
(with-current-buffer (car buffer-point)
- (goto-char (or (cdr buffer-point) (point-min)))
- (point-marker)))))
+ (save-excursion
+ (goto-char (or (cdr buffer-point) (point-min)))
+ (point-marker))))))
(cl-defmethod xref-location-group ((l xref-elisp-location))
(xref-elisp-location-file l))
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index a2a0df2d6e1..890d55294cf 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -2146,8 +2146,9 @@ for \\[find-tag] (which see)."
(with-slots (tag-info file) l
(let ((buffer (find-file-noselect file)))
(with-current-buffer buffer
- (etags-goto-tag-location tag-info)
- (point-marker)))))
+ (save-excursion
+ (etags-goto-tag-location tag-info)
+ (point-marker))))))
(cl-defmethod xref-location-line ((l xref-etags-location))
(with-slots (tag-info) l
--
cgit v1.2.1
From 3347a733e0778dfefaeabe28ae73f4226236a881 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov
Date: Thu, 5 May 2016 16:01:52 +0300
Subject: `nreverse' the marker pairs list
* lisp/progmodes/xref.el (xref--buf-pairs-iterator): `nreverse'
the marker pairs list for each buffer before returning.
---
lisp/progmodes/xref.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 1c28390258c..f651dc9cd18 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -570,7 +570,7 @@ references displayed in the current *xref* buffer."
(t
(setq chunk-done t
next-pair pair))))))))
- (cons file-buf pairs)))
+ (cons file-buf (nreverse pairs))))
(:cleanup
(dolist (pair all-pairs)
(move-marker (car pair) nil)
--
cgit v1.2.1
From 5e814e02f0b0b85fa486975eced09e4a7ed8ce5c Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Thu, 5 May 2016 06:39:17 -0700
Subject: Minor doc fixes for quoting
* doc/lispref/control.texi (Signaling Errors):
* doc/lispref/display.texi (Displaying Messages):
Don’t say that formats “generate”. Try to word more clearly.
* etc/NEWS: Coalesce near-duplicate entries.
---
doc/lispref/control.texi | 13 +++++++------
doc/lispref/display.texi | 13 +++++++------
etc/NEWS | 19 ++++++-------------
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 75d8d284623..0cdb03548bf 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1100,12 +1100,13 @@ These examples show typical uses of @code{error}:
error symbol @code{error}, and a list containing the string returned by
@code{format-message}.
-A format that quotes with grave accents and apostrophes @t{`like
-this'} typically generates curved quotes @t{‘like this’}. In
-contrast, a format that quotes with only apostrophes @t{'like this'}
-typically generates two closing curved quotes @t{’like this’}, an
-unusual style in English. @xref{Keys in Documentation}, for how the
-@code{text-quoting-style} variable affects generated quotes.
+The @code{text-quoting-style} variable controls what quotes are
+generated; @xref{Keys in Documentation}. A call using a format like
+@t{"Missing `%s'"} with grave accents and apostrophes typically
+generates a message like @t{"Missing ‘foo’"} with matching curved
+quotes. In contrast, a call using a format like @t{"Missing '%s'"}
+with only apostrophes typically generates a message like @t{"Missing
+’foo’"} with only closing curved quotes, an unusual style in English.
@strong{Warning:} If you want to use your own string as an error message
verbatim, don't just write @code{(error @var{string})}. If @var{string}
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b0cd8731fe2..181bff09b55 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -265,12 +265,13 @@ properties, it is displayed with the specified faces (@pxref{Faces}).
The string is also added to the @file{*Messages*} buffer, but without
text properties (@pxref{Logging Messages}).
-A format that quotes with grave accents and apostrophes @t{`like
-this'} typically generates curved quotes @t{‘like this’}. In
-contrast, a format that quotes with only apostrophes @t{'like this'}
-typically generates two closing curved quotes @t{’like this’}, an
-unusual style in English. @xref{Keys in Documentation}, for how the
-@code{text-quoting-style} variable affects generated quotes.
+The @code{text-quoting-style} variable controls what quotes are
+generated; @xref{Keys in Documentation}. A call using a format like
+@t{"Missing `%s'"} with grave accents and apostrophes typically
+generates a message like @t{"Missing ‘foo’"} with matching curved
+quotes. In contrast, a call using a format like @t{"Missing '%s'"}
+with only apostrophes typically generates a message like @t{"Missing
+’foo’"} with only closing curved quotes, an unusual style in English.
In batch mode, the message is printed to the standard error stream,
followed by a newline.
diff --git a/etc/NEWS b/etc/NEWS
index 7d6e5334e5c..6c522e06e9e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1476,11 +1476,12 @@ display of diagnostics and help, but not of info. As the variable is
not intended for casual use, it is not a user option.
+++
-** `message' now translates various sorts of single quotes in its
-format string according to the value of `text-quoting-style' (see
-above). This translation cannot be disabled. To get the old
-behavior of `message', use `format', which is not affected by
-`text-quoting-style', e.g. (message "%s" (format "...." foo bar)).
+** Message-issuing functions like 'message' and 'error' now translate
+various sorts of single quotes in their format strings according to
+the value of 'text-quoting-style' (see above). This translation
+cannot be disabled. To get the old behavior, use 'format', which is
+not affected by 'text-quoting-style', e.g., (message "%s" (format
+"...." foo bar)).
+++
** substitute-command-keys now replaces quotes.
@@ -1489,14 +1490,6 @@ value of 'text-quoting-style'. Doc strings in source code can use
either curved single quotes or grave accents and apostrophes. As
before, characters preceded by \= are output as-is.
-+++
-** Message-issuing functions 'error', 'message', etc. now convert quotes.
-They use the new 'format-message' function instead of plain 'format',
-so that they now follow user preference as per 'text-quoting-style'
-when processing curved single quotes, grave accents, and apostrophes
-in their format argument. To process % directives but not quotes, you
-can use calls like (message "%s" (format FORMAT ARG1 ... ARGn)).
-
+++
** The character classes [:alpha:] and [:alnum:] in regular expressions
now match multibyte characters using Unicode character properties.
--
cgit v1.2.1
From 50650cb6887d99b01eeb1e686fc1f695c2a0c64a Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Thu, 5 May 2016 12:48:33 -0700
Subject: Doc fixes for fclist and grep
A newline is needed between two fc-list calls.
egrep and fgrep have been withdrawn from POSIX,
so document grep -E and grep -F instead.
---
doc/emacs/frames.texi | 5 +++--
etc/PROBLEMS | 2 +-
lisp/cedet/cedet-cscope.el | 2 +-
lisp/cedet/semantic/symref.el | 2 +-
lisp/man.el | 2 +-
src/bidi.c | 4 ++--
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 23ccd6a8f41..a7e709f9221 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -764,7 +764,8 @@ Fontconfig fonts, you can use the @command{fc-list} command to list
the available fixed-width fonts, like this:
@example
-fc-list :spacing=mono fc-list :spacing=charcell
+fc-list :spacing=mono
+fc-list :spacing=charcell
@end example
@noindent
@@ -772,7 +773,7 @@ For server-side X fonts, you can use the @command{xlsfonts} program to
list the available fixed-width fonts, like this:
@example
-xlsfonts -fn '*x*' | egrep "^[0-9]+x[0-9]+"
+xlsfonts -fn '*x*' | grep -E '^[0-9]+x[0-9]+'
xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-m*'
xlsfonts -fn '*-*-*-*-*-*-*-*-*-*-*-c*'
@end example
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index be9400bf264..533c4e9be8d 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1655,7 +1655,7 @@ which combination produces "M-x" in the echo area. You can also use
the 'xmodmap' utility to show all the keys which produce a Meta
modifier:
- xmodmap -pk | egrep -i "meta|alt"
+ xmodmap -pk | grep -Ei "meta|alt"
A more convenient way of finding out which keys produce a Meta modifier
is to use the 'xkbprint' utility, if it's available on your system:
diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index 9a54d341f56..373149c16e3 100644
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -52,7 +52,7 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
;; -0 = Find C symbol
;; -1 = Find global definition
;; -3 = Find references
- ;; -6 = Find egrep pattern
+ ;; -6 = Find grep -E pattern
;; -7 = Find file
(let ((idx (cond ((eq type 'file)
"-7")
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 088740b2624..516a4f30414 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -266,7 +266,7 @@ Returns an object of class `semantic-symref-result'."
;;;###autoload
(defun semantic-symref-find-text (text &optional scope)
"Find a list of occurrences of TEXT in the current project.
-TEXT is a regexp formatted for use with egrep.
+TEXT is a regexp formatted for use with grep -E.
Optional SCOPE specifies which file set to search. Defaults to `project'.
Refers to `semantic-symref-tool', to determine the reference tool to use
for the current buffer.
diff --git a/lisp/man.el b/lisp/man.el
index 2b2ee99a9be..5acf90baf28 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -964,7 +964,7 @@ otherwise look like a page name.
An \"apropos\" query with -k gives a buffer of matching page
names or descriptions. The pattern argument is usually an
-\"egrep\" style regexp.
+\"grep -E\" style regexp.
-k pattern"
diff --git a/src/bidi.c b/src/bidi.c
index c23ff954356..573e513469d 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2498,10 +2498,10 @@ typedef struct bpa_stack_entry {
And finally, cross-reference these two:
- fgrep -w -f brackets.txt decompositions.txt
+ grep -Fw -f brackets.txt decompositions.txt
where "decompositions.txt" was produced by the 1st script, and
- "brackets.txt" by the 2nd script. In the output of fgrep, look
+ "brackets.txt" by the 2nd script. In the output of grep, look
only for decompositions that don't begin with some compatibility
formatting tag, such as "". Only decompositions that
consist solely of character codepoints are relevant to bidi
--
cgit v1.2.1