aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorPaul Eggert2015-06-02 22:50:57 -0700
committerPaul Eggert2015-06-02 22:52:44 -0700
commit8e06d22bb654c649da6f32bd235a84eb2f4d188d (patch)
tree5892c615c581c3905d01c5d27562627fd8c837c1 /lisp/vc
parentf2211e51b7bd5247dfc22ecde8e6c4be3821b6fb (diff)
downloademacs-8e06d22bb654c649da6f32bd235a84eb2f4d188d.tar.gz
emacs-8e06d22bb654c649da6f32bd235a84eb2f4d188d.zip
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')
-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
195 (ediff-documentation "Quick Help Commands") 195 (ediff-documentation "Quick Help Commands")
196 196
197 (let (case-fold-search) 197 (let (case-fold-search)
198 (cond ((string= cmd "?") (re-search-forward "^[`‘]\\?['’]")) 198 (cond ((string= cmd "?") (re-search-forward "^['`‘]\\?['’]"))
199 ((string= cmd "G") (re-search-forward "^[`‘]G['’]")) 199 ((string= cmd "G") (re-search-forward "^['`‘]G['’]"))
200 ((string= cmd "E") (re-search-forward "^[`‘]E['’]")) 200 ((string= cmd "E") (re-search-forward "^['`‘]E['’]"))
201 ((string= cmd "wd") (re-search-forward "^[`‘]wd['’]")) 201 ((string= cmd "wd") (re-search-forward "^['`‘]wd['’]"))
202 ((string= cmd "wx") (re-search-forward "^[`‘]wa['’]")) 202 ((string= cmd "wx") (re-search-forward "^['`‘]wa['’]"))
203 ((string= cmd "a/b") (re-search-forward "^[`‘]a['’]")) 203 ((string= cmd "a/b") (re-search-forward "^['`‘]a['’]"))
204 ((string= cmd "x") (re-search-forward "^[`‘]a['’]")) 204 ((string= cmd "x") (re-search-forward "^['`‘]a['’]"))
205 ((string= cmd "xy") (re-search-forward "^[`‘]ab['’]")) 205 ((string= cmd "xy") (re-search-forward "^['`‘]ab['’]"))
206 ((string= cmd "p,DEL") (re-search-forward "^[`‘]p['’]")) 206 ((string= cmd "p,DEL") (re-search-forward "^['`‘]p['’]"))
207 ((string= cmd "n,SPC") (re-search-forward "^[`‘]n['’]")) 207 ((string= cmd "n,SPC") (re-search-forward "^['`‘]n['’]"))
208 ((string= cmd "j") (re-search-forward "^[`‘]j['’]")) 208 ((string= cmd "j") (re-search-forward "^['`‘]j['’]"))
209 ((string= cmd "gx") (re-search-forward "^[`‘]ga['’]")) 209 ((string= cmd "gx") (re-search-forward "^['`‘]ga['’]"))
210 ((string= cmd "!") (re-search-forward "^[`‘]!['’]")) 210 ((string= cmd "!") (re-search-forward "^['`‘]!['’]"))
211 ((string= cmd "*") (re-search-forward "^[`‘]\\*['’]")) 211 ((string= cmd "*") (re-search-forward "^['`‘]\\*['’]"))
212 ((string= cmd "m") (re-search-forward "^[`‘]m['’]")) 212 ((string= cmd "m") (re-search-forward "^['`‘]m['’]"))
213 ((string= cmd "|") (re-search-forward "^[`‘]|['’]")) 213 ((string= cmd "|") (re-search-forward "^['`‘]|['’]"))
214 ((string= cmd "@") (re-search-forward "^[`‘]@['’]")) 214 ((string= cmd "@") (re-search-forward "^['`‘]@['’]"))
215 ((string= cmd "h") (re-search-forward "^[`‘]h['’]")) 215 ((string= cmd "h") (re-search-forward "^['`‘]h['’]"))
216 ((string= cmd "r") (re-search-forward "^[`‘]r['’]")) 216 ((string= cmd "r") (re-search-forward "^['`‘]r['’]"))
217 ((string= cmd "rx") (re-search-forward "^[`‘]ra['’]")) 217 ((string= cmd "rx") (re-search-forward "^['`‘]ra['’]"))
218 ((string= cmd "##") (re-search-forward "^[`‘]##['’]")) 218 ((string= cmd "##") (re-search-forward "^['`‘]##['’]"))
219 ((string= cmd "#c") (re-search-forward "^[`‘]#c['’]")) 219 ((string= cmd "#c") (re-search-forward "^['`‘]#c['’]"))
220 ((string= cmd "#f/#h") (re-search-forward "^[`‘]#f['’]")) 220 ((string= cmd "#f/#h") (re-search-forward "^['`‘]#f['’]"))
221 ((string= cmd "X") (re-search-forward "^[`‘]A['’]")) 221 ((string= cmd "X") (re-search-forward "^['`‘]A['’]"))
222 ((string= cmd "v/V") (re-search-forward "^[`‘]v['’]")) 222 ((string= cmd "v/V") (re-search-forward "^['`‘]v['’]"))
223 ((string= cmd "</>") (re-search-forward "^[`‘]<['’]")) 223 ((string= cmd "</>") (re-search-forward "^['`‘]<['’]"))
224 ((string= cmd "~") (re-search-forward "^[`‘]~['’]")) 224 ((string= cmd "~") (re-search-forward "^['`‘]~['’]"))
225 ((string= cmd "i") (re-search-forward "^[`‘]i['’]")) 225 ((string= cmd "i") (re-search-forward "^['`‘]i['’]"))
226 ((string= cmd "D") (re-search-forward "^[`‘]D['’]")) 226 ((string= cmd "D") (re-search-forward "^['`‘]D['’]"))
227 ((string= cmd "R") (re-search-forward "^[`‘]R['’]")) 227 ((string= cmd "R") (re-search-forward "^['`‘]R['’]"))
228 ((string= cmd "M") (re-search-forward "^[`‘]M['’]")) 228 ((string= cmd "M") (re-search-forward "^['`‘]M['’]"))
229 ((string= cmd "z/q") (re-search-forward "^[`‘]z['’]")) 229 ((string= cmd "z/q") (re-search-forward "^['`‘]z['’]"))
230 ((string= cmd "%") (re-search-forward "^[`‘]%['’]")) 230 ((string= cmd "%") (re-search-forward "^['`‘]%['’]"))
231 ((string= cmd "C-l") (re-search-forward "^[`‘]C-l['’]")) 231 ((string= cmd "C-l") (re-search-forward "^['`‘]C-l['’]"))
232 ((string= cmd "$$") (re-search-forward "^[`‘]\\$\\$['’]")) 232 ((string= cmd "$$") (re-search-forward "^['`‘]\\$\\$['’]"))
233 ((string= cmd "$*") (re-search-forward "^[`‘]\\$\\*['’]")) 233 ((string= cmd "$*") (re-search-forward "^['`‘]\\$\\*['’]"))
234 ((string= cmd "/") (re-search-forward "^[`‘]/['’]")) 234 ((string= cmd "/") (re-search-forward "^['`‘]/['’]"))
235 ((string= cmd "&") (re-search-forward "^[`‘]&['’]")) 235 ((string= cmd "&") (re-search-forward "^['`‘]&['’]"))
236 ((string= cmd "s") (re-search-forward "^[`‘]s['’]")) 236 ((string= cmd "s") (re-search-forward "^['`‘]s['’]"))
237 ((string= cmd "+") (re-search-forward "^[`‘]\\+['’]")) 237 ((string= cmd "+") (re-search-forward "^['`‘]\\+['’]"))
238 ((string= cmd "=") (re-search-forward "^[`‘]=['’]")) 238 ((string= cmd "=") (re-search-forward "^['`‘]=['’]"))
239 (t (error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer"))) 239 (t (error "Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer")))
240 ) ; let case-fold-search 240 ) ; let case-fold-search
241 )) 241 ))