summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-help.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-06-02 22:50:57 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-06-02 22:52:44 -0700
commit8e06d22bb654c649da6f32bd235a84eb2f4d188d (patch)
tree5892c615c581c3905d01c5d27562627fd8c837c1 /lisp/vc/ediff-help.el
parentf2211e51b7bd5247dfc22ecde8e6c4be3821b6fb (diff)
downloademacs-8e06d22bb654c649da6f32bd235a84eb2f4d188d.tar.gz
Support quotes 'like this' in info files
This is possible when 'makeinfo --disable-encoding' is used in Texinfo 5. * lisp/calc/calc-help.el (calc-describe-thing): * lisp/gnus/gnus-art.el (gnus-button-alist): * lisp/info.el (Info-find-index-name): * lisp/vc/ediff-help.el (ediff-help-for-quick-help): Also support quotes 'like this'. * lisp/calc/calc-help.el (calc-describe-thing): Simplify. * lisp/finder.el (finder-font-lock-keywords): Remove var that hasn't been used in years, instead of bothering to fix its quoting.
Diffstat (limited to 'lisp/vc/ediff-help.el')
-rw-r--r--lisp/vc/ediff-help.el82
1 files changed, 41 insertions, 41 deletions
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index 67acc6663a3..3d46869b252 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -195,47 +195,47 @@ the value of this variable and the variables `ediff-help-message-*' in
(ediff-documentation "Quick Help Commands")
(let (case-fold-search)
- (cond ((string= cmd "?") (re-search-forward "^[`‘]\\?['’]"))
- ((string= cmd "G") (re-search-forward "^[`‘]G['’]"))
- ((string= cmd "E") (re-search-forward "^[`‘]E['’]"))
- ((string= cmd "wd") (re-search-forward "^[`‘]wd['’]"))
- ((string= cmd "wx") (re-search-forward "^[`‘]wa['’]"))
- ((string= cmd "a/b") (re-search-forward "^[`‘]a['’]"))
- ((string= cmd "x") (re-search-forward "^[`‘]a['’]"))
- ((string= cmd "xy") (re-search-forward "^[`‘]ab['’]"))
- ((string= cmd "p,DEL") (re-search-forward "^[`‘]p['’]"))
- ((string= cmd "n,SPC") (re-search-forward "^[`‘]n['’]"))
- ((string= cmd "j") (re-search-forward "^[`‘]j['’]"))
- ((string= cmd "gx") (re-search-forward "^[`‘]ga['’]"))
- ((string= cmd "!") (re-search-forward "^[`‘]!['’]"))
- ((string= cmd "*") (re-search-forward "^[`‘]\\*['’]"))
- ((string= cmd "m") (re-search-forward "^[`‘]m['’]"))
- ((string= cmd "|") (re-search-forward "^[`‘]|['’]"))
- ((string= cmd "@") (re-search-forward "^[`‘]@['’]"))
- ((string= cmd "h") (re-search-forward "^[`‘]h['’]"))
- ((string= cmd "r") (re-search-forward "^[`‘]r['’]"))
- ((string= cmd "rx") (re-search-forward "^[`‘]ra['’]"))
- ((string= cmd "##") (re-search-forward "^[`‘]##['’]"))
- ((string= cmd "#c") (re-search-forward "^[`‘]#c['’]"))
- ((string= cmd "#f/#h") (re-search-forward "^[`‘]#f['’]"))
- ((string= cmd "X") (re-search-forward "^[`‘]A['’]"))
- ((string= cmd "v/V") (re-search-forward "^[`‘]v['’]"))
- ((string= cmd "</>") (re-search-forward "^[`‘]<['’]"))
- ((string= cmd "~") (re-search-forward "^[`‘]~['’]"))
- ((string= cmd "i") (re-search-forward "^[`‘]i['’]"))
- ((string= cmd "D") (re-search-forward "^[`‘]D['’]"))
- ((string= cmd "R") (re-search-forward "^[`‘]R['’]"))
- ((string= cmd "M") (re-search-forward "^[`‘]M['’]"))
- ((string= cmd "z/q") (re-search-forward "^[`‘]z['’]"))
- ((string= cmd "%") (re-search-forward "^[`‘]%['’]"))
- ((string= cmd "C-l") (re-search-forward "^[`‘]C-l['’]"))
- ((string= cmd "$$") (re-search-forward "^[`‘]\\$\\$['’]"))
- ((string= cmd "$*") (re-search-forward "^[`‘]\\$\\*['’]"))
- ((string= cmd "/") (re-search-forward "^[`‘]/['’]"))
- ((string= cmd "&") (re-search-forward "^[`‘]&['’]"))
- ((string= cmd "s") (re-search-forward "^[`‘]s['’]"))
- ((string= cmd "+") (re-search-forward "^[`‘]\\+['’]"))
- ((string= cmd "=") (re-search-forward "^[`‘]=['’]"))
+ (cond ((string= cmd "?") (re-search-forward "^['`‘]\\?['’]"))
+ ((string= cmd "G") (re-search-forward "^['`‘]G['’]"))
+ ((string= cmd "E") (re-search-forward "^['`‘]E['’]"))
+ ((string= cmd "wd") (re-search-forward "^['`‘]wd['’]"))
+ ((string= cmd "wx") (re-search-forward "^['`‘]wa['’]"))
+ ((string= cmd "a/b") (re-search-forward "^['`‘]a['’]"))
+ ((string= cmd "x") (re-search-forward "^['`‘]a['’]"))
+ ((string= cmd "xy") (re-search-forward "^['`‘]ab['’]"))
+ ((string= cmd "p,DEL") (re-search-forward "^['`‘]p['’]"))
+ ((string= cmd "n,SPC") (re-search-forward "^['`‘]n['’]"))
+ ((string= cmd "j") (re-search-forward "^['`‘]j['’]"))
+ ((string= cmd "gx") (re-search-forward "^['`‘]ga['’]"))
+ ((string= cmd "!") (re-search-forward "^['`‘]!['’]"))
+ ((string= cmd "*") (re-search-forward "^['`‘]\\*['’]"))
+ ((string= cmd "m") (re-search-forward "^['`‘]m['’]"))
+ ((string= cmd "|") (re-search-forward "^['`‘]|['’]"))
+ ((string= cmd "@") (re-search-forward "^['`‘]@['’]"))
+ ((string= cmd "h") (re-search-forward "^['`‘]h['’]"))
+ ((string= cmd "r") (re-search-forward "^['`‘]r['’]"))
+ ((string= cmd "rx") (re-search-forward "^['`‘]ra['’]"))
+ ((string= cmd "##") (re-search-forward "^['`‘]##['’]"))
+ ((string= cmd "#c") (re-search-forward "^['`‘]#c['’]"))
+ ((string= cmd "#f/#h") (re-search-forward "^['`‘]#f['’]"))
+ ((string= cmd "X") (re-search-forward "^['`‘]A['’]"))
+ ((string= cmd "v/V") (re-search-forward "^['`‘]v['’]"))
+ ((string= cmd "</>") (re-search-forward "^['`‘]<['’]"))
+ ((string= cmd "~") (re-search-forward "^['`‘]~['’]"))
+ ((string= cmd "i") (re-search-forward "^['`‘]i['’]"))
+ ((string= cmd "D") (re-search-forward "^['`‘]D['’]"))
+ ((string= cmd "R") (re-search-forward "^['`‘]R['’]"))
+ ((string= cmd "M") (re-search-forward "^['`‘]M['’]"))
+ ((string= cmd "z/q") (re-search-forward "^['`‘]z['’]"))
+ ((string= cmd "%") (re-search-forward "^['`‘]%['’]"))
+ ((string= cmd "C-l") (re-search-forward "^['`‘]C-l['’]"))
+ ((string= cmd "$$") (re-search-forward "^['`‘]\\$\\$['’]"))
+ ((string= cmd "$*") (re-search-forward "^['`‘]\\$\\*['’]"))
+ ((string= cmd "/") (re-search-forward "^['`‘]/['’]"))
+ ((string= cmd "&") (re-search-forward "^['`‘]&['’]"))
+ ((string= cmd "s") (re-search-forward "^['`‘]s['’]"))
+ ((string= cmd "+") (re-search-forward "^['`‘]\\+['’]"))
+ ((string= cmd "=") (re-search-forward "^['`‘]=['’]"))
(t (error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer")))
) ; let case-fold-search
))