From dc436dd77f70dbc2e294a1fd2d69a332f1413fa5 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 16 Sep 2015 15:52:09 -0700
Subject: [PATCH] Minor backslash fixes in manuals and scripts

* Makefile.in (install-arch-indep):
* admin/charsets/compact.awk:
* admin/charsets/gb180302.awk (gb_to_index):
* admin/charsets/gb180304.awk (gb_to_index):
Avoid undefined behavior in Awk regular expression backslashes.
* doc/misc/efaq.texi (Matching parentheses):
Omit unnecessary backslashes.
* doc/misc/gnus-faq.texi (FAQ 5-8):
Avoid undefined behavior in suggested sed backslash usage.
---
 Makefile.in                 | 4 ++--
 admin/charsets/compact.awk  | 3 +--
 admin/charsets/gb180302.awk | 5 ++---
 admin/charsets/gb180304.awk | 5 ++---
 doc/misc/efaq.texi          | 4 ++--
 doc/misc/gnus-faq.texi      | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3cfbe5704f..4ee84f96ad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -593,8 +593,8 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
 	      rm -f $${subdir}/.gitignore ; \
 	      rm -f $${subdir}/.arch-inventory ; \
 	      rm -f $${subdir}/.DS_Store ; \
-	      rm -f $${subdir}/\#* ; \
-	      rm -f $${subdir}/.\#* ; \
+	      rm -f $${subdir}/#* ; \
+	      rm -f $${subdir}/.#* ; \
 	      rm -f $${subdir}/*~ ; \
 	      rm -f $${subdir}/*.orig ; \
 	      rm -f $${subdir}/ChangeLog* ; \
diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk
index b7d1fd19d8..21e03ee415 100644
--- a/admin/charsets/compact.awk
+++ b/admin/charsets/compact.awk
@@ -69,7 +69,7 @@ function decode_hex(str, idx) {
   return n;
 }
 
-/^\#/ {
+/^#/ {
   print;
   next;
 }
@@ -119,4 +119,3 @@ END {
 	printf "0x%04X-0x%04X 0x%04X\n", from_code, to_code, from_unicode;
     }
 }
-
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index 40d92bf9be..4947f96637 100644
--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -53,7 +53,7 @@ function decode_hex(str) {
 function gb_to_index(gb) {
   b0 = int(gb / 256);
   b1 = gb % 256;
-  idx = (((b0 - 129)) * 191 + b1 - 64); 
+  idx = (((b0 - 129)) * 191 + b1 - 64);
 #  if (b1 >= 128)
 #    idx--;
   return idx
@@ -67,7 +67,7 @@ function index_to_gb(idx) {
   return (b0 * 256 + b1);
 }
 
-/^\#/ {
+/^#/ {
   print;
   next;
 }
@@ -108,4 +108,3 @@ END {
     printf "0x%04X-0x%04X 0x%04X\n",
       index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
 }
-
diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk
index 3c16cb556e..81d7e7301b 100644
--- a/admin/charsets/gb180304.awk
+++ b/admin/charsets/gb180304.awk
@@ -49,7 +49,7 @@ function decode_hex(str) {
 function gb_to_index(gb) {
   b0 = int(gb / 256);
   b1 = gb % 256;
-  idx = (((b0 - 129)) * 191 + b1 - 64); 
+  idx = (((b0 - 129)) * 191 + b1 - 64);
 #  if (b1 >= 127)
 #    idx--;
   return idx
@@ -65,7 +65,7 @@ function index_to_gb(idx) {
   return sprintf("%02X%02X%02X%02X", b0, b1, b2, b3);
 }
 
-/^\#/ {
+/^#/ {
   print;
   next;
 }
@@ -119,4 +119,3 @@ END {
 	}
     }
 }
-
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 3e9109d092..6557f4d017 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2089,8 +2089,8 @@ parenthesis, it simply inserts a % like normal.
 (defun match-paren (arg)
   "Go to the matching paren if on a paren; otherwise insert %."
   (interactive "p")
-  (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1))
-        ((looking-at "\\s\)") (forward-char 1) (backward-list 1))
+  (cond ((looking-at "\\s(") (forward-list 1) (backward-char 1))
+        ((looking-at "\\s)") (forward-char 1) (backward-list 1))
         (t (self-insert-command (or arg 1)))))
 @end lisp
 
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 19c78bf56c..26b9210b0d 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -1528,7 +1528,7 @@ and create the actual X-face by saying
 
 @example
 cat file.xbm | xbm2ikon | compface > file.face
-cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted
+cat file.face | sed 's/["\\]/\\&/g' > file.face.quoted
 @end example
 @noindent
 
-- 
2.39.2