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(-) (limited to 'etc') 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.3 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(+) (limited to 'etc') 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.3 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(-) (limited to 'etc') 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.3 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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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(-) (limited to 'etc') 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.3 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(-) (limited to 'etc') 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.3