From 50650cb6887d99b01eeb1e686fc1f695c2a0c64a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 5 May 2016 12:48:33 -0700 Subject: [PATCH] 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 -- 2.39.2