aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorMichael Heerdegen2018-11-05 01:22:15 +0100
committerMichael Heerdegen2018-11-25 21:08:08 +0100
commit1808d254a5820e8c650013033f800ca2990cd239 (patch)
treedfb19b6117a4781351b17d35b9c404ea16d6e0bf /lisp/textmodes
parent3826ecc795ec2fc11d82432e1b55818c0e2ef685 (diff)
downloademacs-1808d254a5820e8c650013033f800ca2990cd239.tar.gz
emacs-1808d254a5820e8c650013033f800ca2990cd239.zip
Replace insignificant backquotes
Replace most insignificant occurrences of '`' with a straight quote, sharp quote or nothing. This includes backquotes in 'pcase' patterns. * admin/admin.el: * lisp/apropos.el: * lisp/arc-mode.el: * lisp/auth-source.el: * lisp/avoid.el: * lisp/bindings.el: * lisp/bs.el: * lisp/calculator.el: * lisp/calendar/todo-mode.el: * lisp/cedet/semantic.el: * lisp/cedet/semantic/analyze/debug.el: * lisp/cedet/semantic/bovine.el: * lisp/cedet/semantic/dep.el: * lisp/cedet/semantic/grammar.el: * lisp/cedet/semantic/wisent/comp.el: * lisp/cedet/semantic/wisent/grammar.el: * lisp/cedet/srecode/mode.el: * lisp/cus-edit.el: * lisp/doc-view.el: * lisp/elec-pair.el: * lisp/electric.el: * lisp/emacs-lisp/autoload.el: * lisp/emacs-lisp/benchmark.el: * lisp/emacs-lisp/byte-opt.el: * lisp/emacs-lisp/bytecomp.el: * lisp/emacs-lisp/cconv.el: * lisp/emacs-lisp/cl-extra.el: * lisp/emacs-lisp/cl-generic.el: * lisp/emacs-lisp/cl-macs.el: * lisp/emacs-lisp/copyright.el: * lisp/emacs-lisp/debug.el: * lisp/emacs-lisp/eieio-compat.el: * lisp/emacs-lisp/ert.el: * lisp/emacs-lisp/generator.el: * lisp/emacs-lisp/inline.el: * lisp/emacs-lisp/macroexp.el: * lisp/emacs-lisp/map.el: * lisp/emacs-lisp/package-x.el: * lisp/emacs-lisp/package.el: * lisp/emacs-lisp/radix-tree.el: * lisp/emacs-lisp/smie.el: * lisp/epa.el: * lisp/erc/erc-dcc.el: * lisp/erc/erc-track.el: * lisp/erc/erc.el: * lisp/eshell/em-ls.el: * lisp/eshell/esh-cmd.el: * lisp/files.el: * lisp/filesets.el: * lisp/font-lock.el: * lisp/frameset.el: * lisp/gnus/gnus-agent.el: * lisp/gnus/gnus-art.el: * lisp/gnus/gnus-cite.el: * lisp/gnus/gnus-group.el: * lisp/gnus/gnus-msg.el: * lisp/gnus/gnus-salt.el: * lisp/gnus/gnus-srvr.el: * lisp/gnus/gnus-sum.el: * lisp/gnus/gnus-topic.el: * lisp/gnus/gnus-util.el: * lisp/gnus/gnus.el: * lisp/gnus/message.el: * lisp/gnus/mm-util.el: * lisp/gnus/mml.el: * lisp/gnus/nnheader.el: * lisp/gnus/nnimap.el: * lisp/gnus/nnmairix.el: * lisp/gnus/spam.el: * lisp/hexl.el: * lisp/hi-lock.el: * lisp/ibuf-ext.el: * lisp/ibuffer.el: * lisp/ido.el: * lisp/info.el: * lisp/international/mule-cmds.el: * lisp/international/mule-util.el: * lisp/json.el: * lisp/jsonrpc.el: * lisp/language/cyrillic.el: * lisp/language/european.el: * lisp/language/georgian.el: * lisp/language/tibetan.el: * lisp/language/utf-8-lang.el: * lisp/language/vietnamese.el: * lisp/ldefs-boot.el: * lisp/mail/mail-extr.el: * lisp/man.el: * lisp/menu-bar.el: * lisp/mh-e/mh-acros.el: * lisp/mh-e/mh-folder.el: * lisp/mh-e/mh-mime.el: * lisp/mh-e/mh-show.el: * lisp/mh-e/mh-speed.el: * lisp/minibuffer.el: * lisp/mpc.el: * lisp/net/ange-ftp.el: * lisp/net/hmac-def.el: * lisp/net/newst-backend.el: * lisp/net/quickurl.el: * lisp/net/tramp-archive.el: * lisp/net/tramp-compat.el: * lisp/notifications.el: * lisp/obsolete/pgg-parse.el: * lisp/obsolete/vc-arch.el: * lisp/obsolete/xesam.el: * lisp/org/ob-C.el: * lisp/org/ob-core.el: * lisp/org/ob-exp.el: * lisp/org/ob-groovy.el: * lisp/org/ob-haskell.el: * lisp/org/ob-io.el: * lisp/org/ob-lisp.el: * lisp/org/ob-lob.el: * lisp/org/ob-lua.el: * lisp/org/ob-octave.el: * lisp/org/ob-perl.el: * lisp/org/ob-python.el: * lisp/org/ob-ref.el: * lisp/org/ob-ruby.el: * lisp/org/ob-sql.el: * lisp/org/org-agenda.el: * lisp/org/org-capture.el: * lisp/org/org-clock.el: * lisp/org/org-colview.el: * lisp/org/org-duration.el: * lisp/org/org-element.el: * lisp/org/org-entities.el: * lisp/org/org-gnus.el: * lisp/org/org-indent.el: * lisp/org/org-info.el: * lisp/org/org-inlinetask.el: * lisp/org/org-lint.el: * lisp/org/org-list.el: * lisp/org/org-mouse.el: * lisp/org/org-plot.el: * lisp/org/org-src.el: * lisp/org/org-table.el: * lisp/org/org.el: * lisp/org/ox-ascii.el: * lisp/org/ox-html.el: * lisp/org/ox-latex.el: * lisp/org/ox-man.el: * lisp/org/ox-md.el: * lisp/org/ox-org.el: * lisp/org/ox-publish.el: * lisp/org/ox-texinfo.el: * lisp/org/ox.el: * lisp/play/bubbles.el: * lisp/play/gamegrid.el: * lisp/progmodes/autoconf.el: * lisp/progmodes/cc-defs.el: * lisp/progmodes/cc-engine.el: * lisp/progmodes/cc-fonts.el: * lisp/progmodes/cc-langs.el: * lisp/progmodes/cperl-mode.el: * lisp/progmodes/ebrowse.el: * lisp/progmodes/elisp-mode.el: * lisp/progmodes/flymake-cc.el: * lisp/progmodes/flymake.el: * lisp/progmodes/fortran.el: * lisp/progmodes/grep.el: * lisp/progmodes/gud.el: * lisp/progmodes/idlwave.el: * lisp/progmodes/js.el: * lisp/progmodes/m4-mode.el: * lisp/progmodes/make-mode.el: * lisp/progmodes/mixal-mode.el: * lisp/progmodes/modula2.el: * lisp/progmodes/octave.el: * lisp/progmodes/opascal.el: * lisp/progmodes/prolog.el: * lisp/progmodes/ps-mode.el: * lisp/progmodes/python.el: * lisp/progmodes/ruby-mode.el: * lisp/progmodes/sh-script.el: * lisp/progmodes/sql.el: * lisp/progmodes/verilog-mode.el: * lisp/ps-mule.el: * lisp/rtree.el: * lisp/ruler-mode.el: * lisp/ses.el: * lisp/simple.el: * lisp/startup.el: * lisp/subr.el: * lisp/term/ns-win.el: * lisp/textmodes/bibtex.el: * lisp/textmodes/conf-mode.el: * lisp/textmodes/css-mode.el: * lisp/textmodes/refill.el: * lisp/textmodes/sgml-mode.el: * lisp/textmodes/tex-mode.el: * lisp/tutorial.el: * lisp/url/url-dav.el: * lisp/url/url-gw.el: * lisp/url/url-http.el: * lisp/url/url-methods.el: * lisp/url/url-privacy.el: * lisp/vc/cvs-status.el: * lisp/vc/diff-mode.el: * lisp/vc/ediff-init.el: * lisp/vc/ediff-ptch.el: * lisp/vc/log-edit.el: * lisp/vc/log-view.el: * lisp/vc/pcvs-info.el: * lisp/vc/pcvs.el: * lisp/vc/smerge-mode.el: * lisp/vc/vc-git.el: * lisp/vc/vc-hg.el: * lisp/vc/vc-mtn.el: * lisp/vc/vc-rcs.el: * lisp/whitespace.el: * lisp/window.el: * test/lisp/electric-tests.el: * test/lisp/emacs-lisp/cl-lib-tests.el: * test/lisp/emacs-lisp/ert-tests.el: * test/lisp/epg-tests.el: * test/lisp/jsonrpc-tests.el: * test/src/data-tests.el: * test/src/json-tests.el: Replace most insignificant backquotes.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/bibtex.el4
-rw-r--r--lisp/textmodes/conf-mode.el4
-rw-r--r--lisp/textmodes/css-mode.el10
-rw-r--r--lisp/textmodes/refill.el8
-rw-r--r--lisp/textmodes/sgml-mode.el24
-rw-r--r--lisp/textmodes/tex-mode.el8
6 files changed, 29 insertions, 29 deletions
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 57e5ef8017a..eec40429cd5 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -5095,7 +5095,7 @@ entries from minibuffer."
5095 (list beg end 5095 (list beg end
5096 (lambda (s p a) 5096 (lambda (s p a)
5097 (cond 5097 (cond
5098 ((eq a 'metadata) `(metadata (category . bibtex-key))) 5098 ((eq a 'metadata) '(metadata (category . bibtex-key)))
5099 (t (let ((completion-ignore-case nil)) 5099 (t (let ((completion-ignore-case nil))
5100 (complete-with-action 5100 (complete-with-action
5101 a (bibtex-global-key-alist) s p))))) 5101 a (bibtex-global-key-alist) s p)))))
@@ -5113,7 +5113,7 @@ entries from minibuffer."
5113 (list beg end 5113 (list beg end
5114 (lambda (s p a) 5114 (lambda (s p a)
5115 (cond 5115 (cond
5116 ((eq a 'metadata) `(metadata (category . bibtex-string))) 5116 ((eq a 'metadata) '(metadata (category . bibtex-string)))
5117 (t (let ((completion-ignore-case t)) 5117 (t (let ((completion-ignore-case t))
5118 (complete-with-action a compl s p))))) 5118 (complete-with-action a compl s p)))))
5119 :exit-function (bibtex-complete-string-cleanup compl)))))) 5119 :exit-function (bibtex-complete-string-cleanup compl))))))
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 45fd040d10e..0363b927dae 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -230,7 +230,7 @@ This variable is best set in the file local variables, or through
230(put 'conf-space-keywords 'safe-local-variable 'stringp) 230(put 'conf-space-keywords 'safe-local-variable 'stringp)
231 231
232(defvar conf-space-font-lock-keywords 232(defvar conf-space-font-lock-keywords
233 `(;; [section] (do this first because it may look like a parameter) 233 '(;; [section] (do this first because it may look like a parameter)
234 ("^[ \t]*\\[\\(.+\\)\\]" 1 'font-lock-type-face) 234 ("^[ \t]*\\[\\(.+\\)\\]" 1 'font-lock-type-face)
235 ;; section { ... } (do this first because it looks like a parameter) 235 ;; section { ... } (do this first because it looks like a parameter)
236 ("^[ \t]*\\(.+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face) 236 ("^[ \t]*\\(.+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face)
@@ -243,7 +243,7 @@ This variable is best set in the file local variables, or through
243 "Keywords to highlight in Conf Space mode.") 243 "Keywords to highlight in Conf Space mode.")
244 244
245(defvar conf-colon-font-lock-keywords 245(defvar conf-colon-font-lock-keywords
246 `(;; [section] (do this first because it may look like a parameter) 246 '(;; [section] (do this first because it may look like a parameter)
247 ("^[ \t]*\\[\\(.+\\)\\]" 1 'font-lock-type-face) 247 ("^[ \t]*\\[\\(.+\\)\\]" 1 'font-lock-type-face)
248 ;; var: val 248 ;; var: val
249 ("^[ \t]*\\(.+?\\)[ \t]*:" 249 ("^[ \t]*\\(.+?\\)[ \t]*:"
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 2de6455a6ab..f87d6219fd5 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1250,20 +1250,20 @@ for determining whether point is within a selector."
1250 1250
1251(defun css-smie-rules (kind token) 1251(defun css-smie-rules (kind token)
1252 (pcase (cons kind token) 1252 (pcase (cons kind token)
1253 (`(:elem . basic) css-indent-offset) 1253 ('(:elem . basic) css-indent-offset)
1254 (`(:elem . arg) 0) 1254 ('(:elem . arg) 0)
1255 ;; "" stands for BOB (bug#15467). 1255 ;; "" stands for BOB (bug#15467).
1256 (`(:list-intro . ,(or ";" "" ":-property")) t) 1256 (`(:list-intro . ,(or ";" "" ":-property")) t)
1257 (`(:before . "{") 1257 ('(:before . "{")
1258 (when (or (smie-rule-hanging-p) (smie-rule-bolp)) 1258 (when (or (smie-rule-hanging-p) (smie-rule-bolp))
1259 (smie-backward-sexp ";") 1259 (smie-backward-sexp ";")
1260 (unless (eq (char-after) ?\{) 1260 (unless (eq (char-after) ?\{)
1261 (smie-indent-virtual)))) 1261 (smie-indent-virtual))))
1262 (`(:before . "(") 1262 ('(:before . "(")
1263 (cond 1263 (cond
1264 ((smie-rule-hanging-p) (smie-rule-parent 0)) 1264 ((smie-rule-hanging-p) (smie-rule-parent 0))
1265 ((not (smie-rule-bolp)) 0))) 1265 ((not (smie-rule-bolp)) 0)))
1266 (`(:after . ":-property") 1266 ('(:after . ":-property")
1267 (when (smie-rule-hanging-p) 1267 (when (smie-rule-hanging-p)
1268 css-indent-offset)))) 1268 css-indent-offset))))
1269 1269
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index 229d6a24ddd..06709a8cc20 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -169,7 +169,7 @@ complex processing.")
169 (when refill-doit ; there was a change 169 (when refill-doit ; there was a change
170 ;; There's probably scope for more special cases here... 170 ;; There's probably scope for more special cases here...
171 (pcase this-command 171 (pcase this-command
172 (`self-insert-command 172 ('self-insert-command
173 ;; Treat self-insertion commands specially, since they don't 173 ;; Treat self-insertion commands specially, since they don't
174 ;; always reset `refill-doit' -- for self-insertion commands that 174 ;; always reset `refill-doit' -- for self-insertion commands that
175 ;; *don't* cause a refill, we want to leave it turned on so that 175 ;; *don't* cause a refill, we want to leave it turned on so that
@@ -179,9 +179,9 @@ complex processing.")
179 ;; newline, covered below). 179 ;; newline, covered below).
180 (refill-fill-paragraph-at refill-doit) 180 (refill-fill-paragraph-at refill-doit)
181 (setq refill-doit nil))) 181 (setq refill-doit nil)))
182 ((or `quoted-insert `fill-paragraph `fill-region) nil) 182 ((or 'quoted-insert 'fill-paragraph 'fill-region) nil)
183 ((or `newline `newline-and-indent `open-line `indent-new-comment-line 183 ((or 'newline 'newline-and-indent 'open-line 'indent-new-comment-line
184 `reindent-then-newline-and-indent) 184 'reindent-then-newline-and-indent)
185 ;; Don't zap what was just inserted. 185 ;; Don't zap what was just inserted.
186 (save-excursion 186 (save-excursion
187 (beginning-of-line) ; for newline-and-indent 187 (beginning-of-line) ; for newline-and-indent
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 470f4a348ac..21b7082b856 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1524,12 +1524,12 @@ Depending on context, inserts a matching close-tag, or closes
1524the current start-tag or the current comment or the current cdata, ..." 1524the current start-tag or the current comment or the current cdata, ..."
1525 (interactive) 1525 (interactive)
1526 (pcase (car (sgml-lexical-context)) 1526 (pcase (car (sgml-lexical-context))
1527 (`comment (insert " -->")) 1527 ('comment (insert " -->"))
1528 (`cdata (insert "]]>")) 1528 ('cdata (insert "]]>"))
1529 (`pi (insert " ?>")) 1529 ('pi (insert " ?>"))
1530 (`jsp (insert " %>")) 1530 ('jsp (insert " %>"))
1531 (`tag (insert " />")) 1531 ('tag (insert " />"))
1532 (`text 1532 ('text
1533 (let ((context (save-excursion (sgml-get-context)))) 1533 (let ((context (save-excursion (sgml-get-context))))
1534 (if context 1534 (if context
1535 (progn 1535 (progn
@@ -1562,7 +1562,7 @@ LCON is the lexical context, if any."
1562 1562
1563 (pcase (car lcon) 1563 (pcase (car lcon)
1564 1564
1565 (`string 1565 ('string
1566 ;; Go back to previous non-empty line. 1566 ;; Go back to previous non-empty line.
1567 (while (and (> (point) (cdr lcon)) 1567 (while (and (> (point) (cdr lcon))
1568 (zerop (forward-line -1)) 1568 (zerop (forward-line -1))
@@ -1573,7 +1573,7 @@ LCON is the lexical context, if any."
1573 (goto-char (cdr lcon)) 1573 (goto-char (cdr lcon))
1574 (1+ (current-column)))) 1574 (1+ (current-column))))
1575 1575
1576 (`comment 1576 ('comment
1577 (let ((mark (looking-at "--"))) 1577 (let ((mark (looking-at "--")))
1578 ;; Go back to previous non-empty line. 1578 ;; Go back to previous non-empty line.
1579 (while (and (> (point) (cdr lcon)) 1579 (while (and (> (point) (cdr lcon))
@@ -1592,11 +1592,11 @@ LCON is the lexical context, if any."
1592 (current-column))) 1592 (current-column)))
1593 1593
1594 ;; We don't know how to indent it. Let's be honest about it. 1594 ;; We don't know how to indent it. Let's be honest about it.
1595 (`cdata nil) 1595 ('cdata nil)
1596 ;; We don't know how to indent it. Let's be honest about it. 1596 ;; We don't know how to indent it. Let's be honest about it.
1597 (`pi nil) 1597 ('pi nil)
1598 1598
1599 (`tag 1599 ('tag
1600 (goto-char (+ (cdr lcon) sgml-attribute-offset)) 1600 (goto-char (+ (cdr lcon) sgml-attribute-offset))
1601 (skip-chars-forward "^ \t\n") ;Skip tag name. 1601 (skip-chars-forward "^ \t\n") ;Skip tag name.
1602 (skip-chars-forward " \t") 1602 (skip-chars-forward " \t")
@@ -1606,7 +1606,7 @@ LCON is the lexical context, if any."
1606 (goto-char (+ (cdr lcon) sgml-attribute-offset)) 1606 (goto-char (+ (cdr lcon) sgml-attribute-offset))
1607 (+ (current-column) sgml-basic-offset))) 1607 (+ (current-column) sgml-basic-offset)))
1608 1608
1609 (`text 1609 ('text
1610 (while (looking-at "</") 1610 (while (looking-at "</")
1611 (sgml-forward-sexp 1) 1611 (sgml-forward-sexp 1)
1612 (skip-chars-forward " \t")) 1612 (skip-chars-forward " \t"))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 8b0677754f3..63437afa3ba 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -601,9 +601,9 @@ An alternative value is \" . \", if you use a font with a narrow period."
601 (list (concat slash citations opt arg) 3 'font-lock-constant-face) 601 (list (concat slash citations opt arg) 3 'font-lock-constant-face)
602 ;; 602 ;;
603 ;; Text between `` quotes ''. 603 ;; Text between `` quotes ''.
604 (cons (concat (regexp-opt `("``" "\"<" "\"`" "<<" "«") t) 604 (cons (concat (regexp-opt '("``" "\"<" "\"`" "<<" "«") t)
605 "[^'\">{]+" ;a bit pessimistic 605 "[^'\">{]+" ;a bit pessimistic
606 (regexp-opt `("''" "\">" "\"'" ">>" "»") t)) 606 (regexp-opt '("''" "\">" "\"'" ">>" "»") t))
607 'font-lock-string-face) 607 'font-lock-string-face)
608 ;; 608 ;;
609 ;; Command names, special and general. 609 ;; Command names, special and general.
@@ -1656,7 +1656,7 @@ Puts point on a blank line between them."
1656 (let ((pt (point))) 1656 (let ((pt (point)))
1657 (skip-chars-backward "^ {}\n\t\\\\") 1657 (skip-chars-backward "^ {}\n\t\\\\")
1658 (pcase (char-before) 1658 (pcase (char-before)
1659 ((or `nil ?\s ?\n ?\t ?\}) nil) 1659 ((or 'nil ?\s ?\n ?\t ?\}) nil)
1660 (?\\ 1660 (?\\
1661 ;; TODO: Complete commands. 1661 ;; TODO: Complete commands.
1662 nil) 1662 nil)
@@ -2994,7 +2994,7 @@ There might be text before point."
2994 (mapcar 2994 (mapcar
2995 (lambda (x) 2995 (lambda (x)
2996 (pcase (car-safe x) 2996 (pcase (car-safe x)
2997 (`font-lock-syntactic-face-function 2997 ('font-lock-syntactic-face-function
2998 (cons (car x) #'doctex-font-lock-syntactic-face-function)) 2998 (cons (car x) #'doctex-font-lock-syntactic-face-function))
2999 (_ x))) 2999 (_ x)))
3000 (cdr font-lock-defaults)))) 3000 (cdr font-lock-defaults))))