diff options
| author | Paul Eggert | 2015-09-16 15:52:09 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-09-16 15:59:13 -0700 |
| commit | dc436dd77f70dbc2e294a1fd2d69a332f1413fa5 (patch) | |
| tree | 84ba3af906962c65120fa1194b6908127d1a86a4 | |
| parent | 8865587c55f251ac624e6730505de66d15b28562 (diff) | |
| download | emacs-dc436dd77f70dbc2e294a1fd2d69a332f1413fa5.tar.gz emacs-dc436dd77f70dbc2e294a1fd2d69a332f1413fa5.zip | |
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.
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | admin/charsets/compact.awk | 3 | ||||
| -rw-r--r-- | admin/charsets/gb180302.awk | 5 | ||||
| -rw-r--r-- | admin/charsets/gb180304.awk | 5 | ||||
| -rw-r--r-- | doc/misc/efaq.texi | 4 | ||||
| -rw-r--r-- | doc/misc/gnus-faq.texi | 2 |
6 files changed, 10 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index 3cfbe5704ff..4ee84f96ad6 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -593,8 +593,8 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} | |||
| 593 | rm -f $${subdir}/.gitignore ; \ | 593 | rm -f $${subdir}/.gitignore ; \ |
| 594 | rm -f $${subdir}/.arch-inventory ; \ | 594 | rm -f $${subdir}/.arch-inventory ; \ |
| 595 | rm -f $${subdir}/.DS_Store ; \ | 595 | rm -f $${subdir}/.DS_Store ; \ |
| 596 | rm -f $${subdir}/\#* ; \ | 596 | rm -f $${subdir}/#* ; \ |
| 597 | rm -f $${subdir}/.\#* ; \ | 597 | rm -f $${subdir}/.#* ; \ |
| 598 | rm -f $${subdir}/*~ ; \ | 598 | rm -f $${subdir}/*~ ; \ |
| 599 | rm -f $${subdir}/*.orig ; \ | 599 | rm -f $${subdir}/*.orig ; \ |
| 600 | rm -f $${subdir}/ChangeLog* ; \ | 600 | rm -f $${subdir}/ChangeLog* ; \ |
diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk index b7d1fd19d8e..21e03ee4157 100644 --- a/admin/charsets/compact.awk +++ b/admin/charsets/compact.awk | |||
| @@ -69,7 +69,7 @@ function decode_hex(str, idx) { | |||
| 69 | return n; | 69 | return n; |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /^\#/ { | 72 | /^#/ { |
| 73 | print; | 73 | print; |
| 74 | next; | 74 | next; |
| 75 | } | 75 | } |
| @@ -119,4 +119,3 @@ END { | |||
| 119 | printf "0x%04X-0x%04X 0x%04X\n", from_code, to_code, from_unicode; | 119 | printf "0x%04X-0x%04X 0x%04X\n", from_code, to_code, from_unicode; |
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| 122 | |||
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk index 40d92bf9be4..4947f966371 100644 --- a/admin/charsets/gb180302.awk +++ b/admin/charsets/gb180302.awk | |||
| @@ -53,7 +53,7 @@ function decode_hex(str) { | |||
| 53 | function gb_to_index(gb) { | 53 | function gb_to_index(gb) { |
| 54 | b0 = int(gb / 256); | 54 | b0 = int(gb / 256); |
| 55 | b1 = gb % 256; | 55 | b1 = gb % 256; |
| 56 | idx = (((b0 - 129)) * 191 + b1 - 64); | 56 | idx = (((b0 - 129)) * 191 + b1 - 64); |
| 57 | # if (b1 >= 128) | 57 | # if (b1 >= 128) |
| 58 | # idx--; | 58 | # idx--; |
| 59 | return idx | 59 | return idx |
| @@ -67,7 +67,7 @@ function index_to_gb(idx) { | |||
| 67 | return (b0 * 256 + b1); | 67 | return (b0 * 256 + b1); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | /^\#/ { | 70 | /^#/ { |
| 71 | print; | 71 | print; |
| 72 | next; | 72 | next; |
| 73 | } | 73 | } |
| @@ -108,4 +108,3 @@ END { | |||
| 108 | printf "0x%04X-0x%04X 0x%04X\n", | 108 | printf "0x%04X-0x%04X 0x%04X\n", |
| 109 | index_to_gb(from_gb), index_to_gb(to_gb), from_unicode; | 109 | index_to_gb(from_gb), index_to_gb(to_gb), from_unicode; |
| 110 | } | 110 | } |
| 111 | |||
diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk index 3c16cb556ea..81d7e7301bf 100644 --- a/admin/charsets/gb180304.awk +++ b/admin/charsets/gb180304.awk | |||
| @@ -49,7 +49,7 @@ function decode_hex(str) { | |||
| 49 | function gb_to_index(gb) { | 49 | function gb_to_index(gb) { |
| 50 | b0 = int(gb / 256); | 50 | b0 = int(gb / 256); |
| 51 | b1 = gb % 256; | 51 | b1 = gb % 256; |
| 52 | idx = (((b0 - 129)) * 191 + b1 - 64); | 52 | idx = (((b0 - 129)) * 191 + b1 - 64); |
| 53 | # if (b1 >= 127) | 53 | # if (b1 >= 127) |
| 54 | # idx--; | 54 | # idx--; |
| 55 | return idx | 55 | return idx |
| @@ -65,7 +65,7 @@ function index_to_gb(idx) { | |||
| 65 | return sprintf("%02X%02X%02X%02X", b0, b1, b2, b3); | 65 | return sprintf("%02X%02X%02X%02X", b0, b1, b2, b3); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | /^\#/ { | 68 | /^#/ { |
| 69 | print; | 69 | print; |
| 70 | next; | 70 | next; |
| 71 | } | 71 | } |
| @@ -119,4 +119,3 @@ END { | |||
| 119 | } | 119 | } |
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| 122 | |||
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 3e9109d0924..6557f4d017b 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi | |||
| @@ -2089,8 +2089,8 @@ parenthesis, it simply inserts a % like normal. | |||
| 2089 | (defun match-paren (arg) | 2089 | (defun match-paren (arg) |
| 2090 | "Go to the matching paren if on a paren; otherwise insert %." | 2090 | "Go to the matching paren if on a paren; otherwise insert %." |
| 2091 | (interactive "p") | 2091 | (interactive "p") |
| 2092 | (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1)) | 2092 | (cond ((looking-at "\\s(") (forward-list 1) (backward-char 1)) |
| 2093 | ((looking-at "\\s\)") (forward-char 1) (backward-list 1)) | 2093 | ((looking-at "\\s)") (forward-char 1) (backward-list 1)) |
| 2094 | (t (self-insert-command (or arg 1))))) | 2094 | (t (self-insert-command (or arg 1))))) |
| 2095 | @end lisp | 2095 | @end lisp |
| 2096 | 2096 | ||
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 19c78bf56c6..26b9210b0dd 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 | |||
| 1528 | 1528 | ||
| 1529 | @example | 1529 | @example |
| 1530 | cat file.xbm | xbm2ikon | compface > file.face | 1530 | cat file.xbm | xbm2ikon | compface > file.face |
| 1531 | cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted | 1531 | cat file.face | sed 's/["\\]/\\&/g' > file.face.quoted |
| 1532 | @end example | 1532 | @end example |
| 1533 | @noindent | 1533 | @noindent |
| 1534 | 1534 | ||