Merge from origin/emacs-26

b3f4a3a (origin/emacs-26) Special-case %DUMBFW for GnuTLS between 3.2...
c2ae057 Work around GnuTLS version issues with %DUMBFW (tiny change)
2f9d9ef ; Remove the mention of "plain C code" in the docstring as well
aca827b Merge branch 'widen-less' into emacs-26
87548f5 ; Rephrase NEWS entry a bit
da0d773 (emacs-26) ; * lisp/erc/erc.el: Update URL.
3a60515 * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler...
471b6c1 ; Replace non-ascii quote characters in doc strings etc
7af7f5e Fix some more aliases to user options
79fb4b5 Fix some flymake aliases
b9fbc03 (origin/widen-less) Widen in indent-for-tab-command in the no...
446faf3 Replace the mention of c-indent-defun with js-indent-line
7e9eef0 Consolidate 'widen' calls

# Conflicts:
#	etc/NEWS
#	lisp/progmodes/flymake-proc.el

1 files changed, 12 insertions, 12 deletions

diff --git a/admin/last-chance.el b/admin/last-chance.el
index 76b8bcf6db1..cd3f78bd595 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -25,13 +25,13 @@
 ;;; Commentary:
 
 ;; Late 2016.  In a recent build, the date in a ChangeLog file
-;; is not fontified.  Turns out the face ‘change-log-date-face’
+;; is not fontified.  Turns out the face `change-log-date-face'
 ;; was declared obsolete since 22.1 and removed 2016-06-23.
 ;; (compile "git show c430f7e23fc2c22f251ace4254e37dea1452dfc3")
 ;;
-;; This library provides a command ‘last-chance’, which is a small
+;; This library provides a command `last-chance', which is a small
 ;; combination of "git grep" and some regexp filtering.  For example,
-;; if point is on the symbol ‘change-log-date-face’ in the form:
+;; if point is on the symbol `change-log-date-face' in the form:
 ;;
 ;;  (define-obsolete-face-alias 'change-log-date-face ...)
 ;;
@@ -39,7 +39,7 @@
 ;;
 ;;  M-x last-chance RET
 ;;
-;; will show you any references to ‘change-log-date-face’ in the
+;; will show you any references to `change-log-date-face' in the
 ;; *.el files in a new buffer (in Grep mode).  Hopefully you see
 ;; only the obsolete declaration and can proceed w/ its removal.
 ;; If not, please DTRT and refrain from the removal until those
@@ -59,17 +59,17 @@ This should include -n, -H, -F.")
 (defvar last-chance-uninteresting-regexps
   '("ChangeLog[.0-9]*:"
     "NEWS[-.0-9]*:"
-    ;; Add more ‘flush-lines’ args here.
+    ;; Add more `flush-lines' args here.
     )
   "List of regexps that match uninteresting \"git grep\" hits.")
 
 (defvar-local last-chance-symbol nil
-  "Symbol set by ‘last-chance’ for ‘last-chance-cleanup’ to DTRT.")
+  "Symbol set by `last-chance' for `last-chance-cleanup' to DTRT.")
 
 (defun last-chance-cleanup (buffer status)
   "Filter lines in BUFFER; append STATUS and count of removed lines.
-If BUFFER does not seem to be one created by ‘last-chance’, do nothing.
-This function is intended to be added to ‘compilation-finish-functions’."
+If BUFFER does not seem to be one created by `last-chance', do nothing.
+This function is intended to be added to `compilation-finish-functions'."
   (let ((name (buffer-local-value 'last-chance-symbol buffer))
         bef aft)
     (when name
@@ -90,10 +90,10 @@ This function is intended to be added to ‘compilation-finish-functions’."
 
 (defun last-chance (symbol)
   "Grep the repo for SYMBOL, filtering the hits.
-This uses ‘last-chance-grep-command’ to do the grep and the
-regexps in ‘last-chance-uninteresting-regexps’ to filter the hits.
-Grepping is recursive starting under the dir that ‘vc-root-dir’
-finds (or the default directory if ‘vc-root-dir’ finds nothing).
+This uses `last-chance-grep-command' to do the grep and the
+regexps in `last-chance-uninteresting-regexps' to filter the hits.
+Grepping is recursive starting under the dir that `vc-root-dir'
+finds (or the default directory if `vc-root-dir' finds nothing).
 Output goes to the *grep* buffer.
 
 Interactively, Emacs queries for a symbol,