diff options
| author | Paul Eggert | 2019-03-18 17:02:01 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-03-18 17:02:29 -0700 |
| commit | bc2a93d5b7c3d749b31927452e31b32bdb1b9108 (patch) | |
| tree | 9038a94278160988f7d37191d6863f94178e2cb1 | |
| parent | 7f6c6253c939a2034b840c279c3e4dca973b263a (diff) | |
| download | emacs-bc2a93d5b7c3d749b31927452e31b32bdb1b9108.tar.gz emacs-bc2a93d5b7c3d749b31927452e31b32bdb1b9108.zip | |
Fix more regular expression typos
Problem reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-03/msg00548.html
except that I didn’t address the issues involving Hebrew,
or involving comint-prompt-regexp.
* lisp/align.el (align-rules-list, align-exclude-rules-list):
* lisp/auth-source-pass.el (auth-source-pass--parse-secret)
(auth-source-pass--parse-data):
* lisp/cedet/data-debug.el (data-debug-next)
(data-debug-prev, data-debug-expand-or-contract):
* lisp/comint.el (comint-within-quotes):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emulation/viper-ex.el (ex-cmd-complete):
* lisp/gnus/gnus-cite.el (gnus-message-search-citation-line):
* lisp/gnus/nnir.el (nnir-imap-end-of-input):
* lisp/mail/mail-extr.el (mail-extr-all-letters):
* lisp/minibuffer.el (minibuffer-maybe-quote-filename):
* lisp/nxml/rng-nxml.el (rng-complete-tag)
(rng-complete-end-tag, rng-complete-attribute-name):
* lisp/obsolete/vip.el (vip-get-ex-token, vip-get-ex-pat):
* lisp/org/org-pcomplete.el (org-thing-at-point):
* lisp/org/org.el (org-set-tags)
(org-increase-number-at-point)
(org-fill-line-break-nobreak-p):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/ada-mode.el (ada-compile-goto-error):
* lisp/progmodes/cperl-mode.el (cperl-highlight-charclass)
(cperl-find-pods-heres, cperl-not-bad-style-regexp)
(cperl-regext-to-level-start):
* lisp/progmodes/ebnf-yac.el (ebnf-yac-skip-spaces):
* lisp/progmodes/flymake-proc.el (flymake-proc-master-tex-init):
* lisp/progmodes/flymake.el (flymake-diag-region):
* lisp/progmodes/fortran.el (fortran-current-line-indentation):
* lisp/progmodes/idlw-complete-structtag.el:
(idlwave-complete-structure-tag):
* lisp/progmodes/idlwave.el (idlwave-complete-sysvar-or-tag):
* lisp/progmodes/prolog.el (prolog-pred-end)
(prolog-clause-info):
* lisp/progmodes/ruby-mode.el (ruby-forward-sexp)
(ruby-backward-sexp):
* lisp/progmodes/verilog-mode.el (verilog-repair-open-comma):
* lisp/term.el (term-within-quotes):
* lisp/textmodes/bib-mode.el (bib-capitalize-title-stop-words):
* lisp/textmodes/refbib.el (r2b-capitalize-title-stop-words):
* lisp/textmodes/reftex-parse.el (reftex-nth-arg):
* lisp/textmodes/rst.el (rst-svn-rev):
* lisp/url/url-http.el (url-http-parse-response):
* test/lisp/progmodes/f90-tests.el (f90-test-bug3730):
Fix regular expression typos.
33 files changed, 56 insertions, 64 deletions
diff --git a/lisp/align.el b/lisp/align.el index 594d15eee15..a81498be5d0 100644 --- a/lisp/align.el +++ b/lisp/align.el | |||
| @@ -452,7 +452,7 @@ The possible settings for `align-region-separate' are: | |||
| 452 | (tab-stop . nil)) | 452 | (tab-stop . nil)) |
| 453 | 453 | ||
| 454 | (make-assignment | 454 | (make-assignment |
| 455 | (regexp . "^\\s-*\\w+\\(\\s-*\\):?=\\(\\s-*\\)\\([^\t\n \\\\]\\|$\\)") | 455 | (regexp . "^\\s-*\\w+\\(\\s-*\\):?=\\(\\s-*\\)\\([^\t\n \\]\\|$\\)") |
| 456 | (group . (1 2)) | 456 | (group . (1 2)) |
| 457 | (modes . '(makefile-mode)) | 457 | (modes . '(makefile-mode)) |
| 458 | (tab-stop . nil)) | 458 | (tab-stop . nil)) |
| @@ -759,7 +759,7 @@ The following attributes are meaningful: | |||
| 759 | (lambda (end reverse) | 759 | (lambda (end reverse) |
| 760 | (funcall (if reverse 're-search-backward | 760 | (funcall (if reverse 're-search-backward |
| 761 | 're-search-forward) | 761 | 're-search-forward) |
| 762 | (concat "[^ \t\n\\\\]" | 762 | (concat "[^ \t\n\\]" |
| 763 | (regexp-quote comment-start) | 763 | (regexp-quote comment-start) |
| 764 | "\\(.+\\)$") end t)))) | 764 | "\\(.+\\)$") end t)))) |
| 765 | (modes . align-open-comment-modes)) | 765 | (modes . align-open-comment-modes)) |
diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el index deb805a6e1a..29ff9c66856 100644 --- a/lisp/auth-source-pass.el +++ b/lisp/auth-source-pass.el | |||
| @@ -134,12 +134,12 @@ ENTRY is the name of a password-store entry." | |||
| 134 | (defun auth-source-pass--parse-secret (contents) | 134 | (defun auth-source-pass--parse-secret (contents) |
| 135 | "Parse the password-store data in the string CONTENTS and return its secret. | 135 | "Parse the password-store data in the string CONTENTS and return its secret. |
| 136 | The secret is the first line of CONTENTS." | 136 | The secret is the first line of CONTENTS." |
| 137 | (car (split-string contents "\\\n" t))) | 137 | (car (split-string contents "\n" t))) |
| 138 | 138 | ||
| 139 | (defun auth-source-pass--parse-data (contents) | 139 | (defun auth-source-pass--parse-data (contents) |
| 140 | "Parse the password-store data in the string CONTENTS and return an alist. | 140 | "Parse the password-store data in the string CONTENTS and return an alist. |
| 141 | CONTENTS is the contents of a password-store formatted file." | 141 | CONTENTS is the contents of a password-store formatted file." |
| 142 | (let ((lines (split-string contents "\\\n" t "\\\s"))) | 142 | (let ((lines (split-string contents "\n" t "\\\s"))) |
| 143 | (seq-remove #'null | 143 | (seq-remove #'null |
| 144 | (mapcar (lambda (line) | 144 | (mapcar (lambda (line) |
| 145 | (let ((pair (mapcar (lambda (s) (string-trim s)) | 145 | (let ((pair (mapcar (lambda (s) (string-trim s)) |
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el index ba312433d38..eeec6b5834b 100644 --- a/lisp/cedet/data-debug.el +++ b/lisp/cedet/data-debug.el | |||
| @@ -920,14 +920,14 @@ If PARENT is non-nil, it is somehow related as a parent to thing." | |||
| 920 | (interactive) | 920 | (interactive) |
| 921 | (forward-line 1) | 921 | (forward-line 1) |
| 922 | (beginning-of-line) | 922 | (beginning-of-line) |
| 923 | (skip-chars-forward " *-><[]" (point-at-eol))) | 923 | (skip-chars-forward "- *><[]" (point-at-eol))) |
| 924 | 924 | ||
| 925 | (defun data-debug-prev () | 925 | (defun data-debug-prev () |
| 926 | "Go to the previous line in the Ddebug buffer." | 926 | "Go to the previous line in the Ddebug buffer." |
| 927 | (interactive) | 927 | (interactive) |
| 928 | (forward-line -1) | 928 | (forward-line -1) |
| 929 | (beginning-of-line) | 929 | (beginning-of-line) |
| 930 | (skip-chars-forward " *-><[]" (point-at-eol))) | 930 | (skip-chars-forward "- *><[]" (point-at-eol))) |
| 931 | 931 | ||
| 932 | (defun data-debug-next-expando () | 932 | (defun data-debug-next-expando () |
| 933 | "Go to the next line in the Ddebug buffer. | 933 | "Go to the next line in the Ddebug buffer. |
| @@ -1014,7 +1014,7 @@ Do nothing if already contracted." | |||
| 1014 | (data-debug-current-line-expanded-p)) | 1014 | (data-debug-current-line-expanded-p)) |
| 1015 | (data-debug-contract-current-line) | 1015 | (data-debug-contract-current-line) |
| 1016 | (data-debug-expand-current-line)) | 1016 | (data-debug-expand-current-line)) |
| 1017 | (skip-chars-forward " *-><[]" (point-at-eol))) | 1017 | (skip-chars-forward "- *><[]" (point-at-eol))) |
| 1018 | 1018 | ||
| 1019 | (defun data-debug-expand-or-contract-mouse (event) | 1019 | (defun data-debug-expand-or-contract-mouse (event) |
| 1020 | "Expand or contract anything at event EVENT." | 1020 | "Expand or contract anything at event EVENT." |
diff --git a/lisp/comint.el b/lisp/comint.el index a5fca7ea2a1..a71821baa5e 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -1618,8 +1618,8 @@ Go to the history element by the absolute history position HIST-POS." | |||
| 1618 | (defun comint-within-quotes (beg end) | 1618 | (defun comint-within-quotes (beg end) |
| 1619 | "Return t if the number of quotes between BEG and END is odd. | 1619 | "Return t if the number of quotes between BEG and END is odd. |
| 1620 | Quotes are single and double." | 1620 | Quotes are single and double." |
| 1621 | (let ((countsq (comint-how-many-region "\\(^\\|[^\\\\]\\)'" beg end)) | 1621 | (let ((countsq (comint-how-many-region "\\(^\\|[^\\]\\)'" beg end)) |
| 1622 | (countdq (comint-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end))) | 1622 | (countdq (comint-how-many-region "\\(^\\|[^\\]\\)\"" beg end))) |
| 1623 | (or (= (mod countsq 2) 1) (= (mod countdq 2) 1)))) | 1623 | (or (= (mod countsq 2) 1) (= (mod countdq 2) 1)))) |
| 1624 | 1624 | ||
| 1625 | (defun comint-how-many-region (regexp beg end) | 1625 | (defun comint-how-many-region (regexp beg end) |
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index dca2f169567..fa6f85c588d 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el | |||
| @@ -1511,7 +1511,7 @@ may require more formatting") | |||
| 1511 | (line-end-position)))))))) | 1511 | (line-end-position)))))))) |
| 1512 | ;; Continuation of above. Make sure our sentence is capitalized. | 1512 | ;; Continuation of above. Make sure our sentence is capitalized. |
| 1513 | (save-excursion | 1513 | (save-excursion |
| 1514 | (skip-chars-forward "\"\\*") | 1514 | (skip-chars-forward "\"*") |
| 1515 | (if (looking-at "[a-z]") | 1515 | (if (looking-at "[a-z]") |
| 1516 | (if (checkdoc-autofix-ask-replace | 1516 | (if (checkdoc-autofix-ask-replace |
| 1517 | (match-beginning 0) (match-end 0) | 1517 | (match-beginning 0) (match-end 0) |
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index f5090573c86..45b91cd9c0e 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el | |||
| @@ -565,7 +565,7 @@ reversed." | |||
| 565 | (let (save-pos dist compl-list string-to-complete completion-result) | 565 | (let (save-pos dist compl-list string-to-complete completion-result) |
| 566 | 566 | ||
| 567 | (save-excursion | 567 | (save-excursion |
| 568 | (setq dist (skip-chars-backward "[a-zA-Z!=>&~]") | 568 | (setq dist (skip-chars-backward "a-zA-Z!=>&~") |
| 569 | save-pos (point))) | 569 | save-pos (point))) |
| 570 | 570 | ||
| 571 | (if (or (= dist 0) | 571 | (if (or (= dist 0) |
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el index 2216d4a0420..7e431e79fc7 100644 --- a/lisp/gnus/gnus-cite.el +++ b/lisp/gnus/gnus-cite.el | |||
| @@ -1128,7 +1128,7 @@ Returns nil if there is no such line before LIMIT, t otherwise." | |||
| 1128 | (let ((cdepth (min (length (apply 'concat | 1128 | (let ((cdepth (min (length (apply 'concat |
| 1129 | (split-string | 1129 | (split-string |
| 1130 | (match-string-no-properties 0) | 1130 | (match-string-no-properties 0) |
| 1131 | "[ \t [:alnum:]]+"))) | 1131 | "[\t [:alnum:]]+"))) |
| 1132 | gnus-message-max-citation-depth)) | 1132 | gnus-message-max-citation-depth)) |
| 1133 | (mlist (make-list (* (1+ gnus-message-max-citation-depth) 2) nil)) | 1133 | (mlist (make-list (* (1+ gnus-message-max-citation-depth) 2) nil)) |
| 1134 | (start (point-at-bol)) | 1134 | (start (point-at-bol)) |
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 7c94abde0d7..37a38a58d46 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el | |||
| @@ -1185,7 +1185,7 @@ returning the one at the supplied position." | |||
| 1185 | 1185 | ||
| 1186 | (defun nnir-imap-end-of-input () | 1186 | (defun nnir-imap-end-of-input () |
| 1187 | "Are we at the end of input?" | 1187 | "Are we at the end of input?" |
| 1188 | (skip-chars-forward "[[:blank:]]") | 1188 | (skip-chars-forward "[:blank:]") |
| 1189 | (looking-at "$")) | 1189 | (looking-at "$")) |
| 1190 | 1190 | ||
| 1191 | 1191 | ||
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index ae849d7b62b..cb57d8ea016 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el | |||
| @@ -293,7 +293,7 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"." | |||
| 293 | ;; multipart names. | 293 | ;; multipart names. |
| 294 | ;; #### should . be in here? | 294 | ;; #### should . be in here? |
| 295 | (defconst mail-extr-all-letters | 295 | (defconst mail-extr-all-letters |
| 296 | (purecopy (concat mail-extr-all-letters-but-separators "---"))) | 296 | (purecopy (concat mail-extr-all-letters-but-separators "-"))) |
| 297 | 297 | ||
| 298 | ;; Any character that can start a name. | 298 | ;; Any character that can start a name. |
| 299 | ;; Keep this set as minimal as possible. | 299 | ;; Keep this set as minimal as possible. |
| @@ -305,19 +305,11 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"." | |||
| 305 | 305 | ||
| 306 | (defconst mail-extr-leading-garbage "\\W+") | 306 | (defconst mail-extr-leading-garbage "\\W+") |
| 307 | 307 | ||
| 308 | ;; (defconst mail-extr-non-name-chars | ||
| 309 | ;; (purecopy (concat "^" mail-extr-all-letters "."))) | ||
| 310 | ;; (defconst mail-extr-non-begin-name-chars | 308 | ;; (defconst mail-extr-non-begin-name-chars |
| 311 | ;; (purecopy (concat "^" mail-extr-first-letters))) | 309 | ;; (purecopy (concat "^" mail-extr-first-letters))) |
| 312 | ;; (defconst mail-extr-non-end-name-chars | 310 | ;; (defconst mail-extr-non-end-name-chars |
| 313 | ;; (purecopy (concat "^" mail-extr-last-letters))) | 311 | ;; (purecopy (concat "^" mail-extr-last-letters))) |
| 314 | 312 | ||
| 315 | ;; Matches an initial not followed by both a period and a space. | ||
| 316 | ;; (defconst mail-extr-bad-initials-pattern | ||
| 317 | ;; (purecopy | ||
| 318 | ;; (format "\\(\\([^%s]\\|\\`\\)[%s]\\)\\(\\.\\([^ ]\\)\\| \\|\\([^%s .]\\)\\|\\'\\)" | ||
| 319 | ;; mail-extr-all-letters mail-extr-first-letters mail-extr-all-letters))) | ||
| 320 | |||
| 321 | ;; Matches periods used instead of spaces. Must not match the period | 313 | ;; Matches periods used instead of spaces. Must not match the period |
| 322 | ;; following an initial. | 314 | ;; following an initial. |
| 323 | (defconst mail-extr-bad-dot-pattern | 315 | (defconst mail-extr-bad-dot-pattern |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index c5d714846d7..df0acbb343d 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -2297,7 +2297,7 @@ Useful to give the user default values that won't be substituted." | |||
| 2297 | (if (and (not (file-name-quoted-p filename)) | 2297 | (if (and (not (file-name-quoted-p filename)) |
| 2298 | (file-name-absolute-p filename) | 2298 | (file-name-absolute-p filename) |
| 2299 | (string-match-p (if (memq system-type '(windows-nt ms-dos)) | 2299 | (string-match-p (if (memq system-type '(windows-nt ms-dos)) |
| 2300 | "[/\\\\]~" "/~") | 2300 | "[/\\]~" "/~") |
| 2301 | (file-local-name filename))) | 2301 | (file-local-name filename))) |
| 2302 | (file-name-quote filename) | 2302 | (file-name-quote filename) |
| 2303 | (minibuffer--double-dollars filename))) | 2303 | (minibuffer--double-dollars filename))) |
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el index c110937b34b..05b59316d13 100644 --- a/lisp/nxml/rng-nxml.el +++ b/lisp/nxml/rng-nxml.el | |||
| @@ -160,7 +160,7 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil." | |||
| 160 | (and rng-collecting-text (rng-flush-text)) | 160 | (and rng-collecting-text (rng-flush-text)) |
| 161 | (let ((target-names (rng-match-possible-start-tag-names))) | 161 | (let ((target-names (rng-match-possible-start-tag-names))) |
| 162 | `(,(1+ lt-pos) | 162 | `(,(1+ lt-pos) |
| 163 | ,(save-excursion (skip-chars-forward "[[:alnum:]_.-:]") (point)) | 163 | ,(save-excursion (skip-chars-forward "-[:alnum:]_.:") (point)) |
| 164 | ,(apply-partially #'rng-complete-qname-function | 164 | ,(apply-partially #'rng-complete-qname-function |
| 165 | target-names nil extra-strings) | 165 | target-names nil extra-strings) |
| 166 | :exit-function | 166 | :exit-function |
| @@ -207,7 +207,7 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil." | |||
| 207 | (cdar rng-open-elements)) | 207 | (cdar rng-open-elements)) |
| 208 | (cdar rng-open-elements)))) | 208 | (cdar rng-open-elements)))) |
| 209 | `(,(+ (match-beginning 0) 2) | 209 | `(,(+ (match-beginning 0) 2) |
| 210 | ,(save-excursion (skip-chars-forward "[[:alnum:]_.-:]") (point)) | 210 | ,(save-excursion (skip-chars-forward "-[:alnum:]_.:") (point)) |
| 211 | ,(list start-tag-name) ;Sole completion candidate. | 211 | ,(list start-tag-name) ;Sole completion candidate. |
| 212 | :exit-function | 212 | :exit-function |
| 213 | ,(lambda (_completion status) | 213 | ,(lambda (_completion status) |
| @@ -247,7 +247,7 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil." | |||
| 247 | "xmlns")) | 247 | "xmlns")) |
| 248 | rng-undeclared-prefixes))) | 248 | rng-undeclared-prefixes))) |
| 249 | `(,attribute-start | 249 | `(,attribute-start |
| 250 | ,(save-excursion (skip-chars-forward "[[:alnum:]_.-:]") (point)) | 250 | ,(save-excursion (skip-chars-forward "-[:alnum:]_.:") (point)) |
| 251 | ,(apply-partially #'rng-complete-qname-function | 251 | ,(apply-partially #'rng-complete-qname-function |
| 252 | target-names t extra-strings) | 252 | target-names t extra-strings) |
| 253 | :exit-function | 253 | :exit-function |
diff --git a/lisp/obsolete/vip.el b/lisp/obsolete/vip.el index 0360db9bca0..bc4b90031ea 100644 --- a/lisp/obsolete/vip.el +++ b/lisp/obsolete/vip.el | |||
| @@ -2216,7 +2216,7 @@ a token has type \(command, address, end-mark\) and value." | |||
| 2216 | (while (and (not (eolp)) cont) | 2216 | (while (and (not (eolp)) cont) |
| 2217 | ;;(re-search-forward "[^/]*/") | 2217 | ;;(re-search-forward "[^/]*/") |
| 2218 | (re-search-forward "[^/]*\\(/\\|\n\\)") | 2218 | (re-search-forward "[^/]*\\(/\\|\n\\)") |
| 2219 | (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\/")) | 2219 | (if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\/")) |
| 2220 | (setq cont nil)))) | 2220 | (setq cont nil)))) |
| 2221 | (backward-char 1) | 2221 | (backward-char 1) |
| 2222 | (setq ex-token (buffer-substring (point) (mark))) | 2222 | (setq ex-token (buffer-substring (point) (mark))) |
| @@ -2229,7 +2229,7 @@ a token has type \(command, address, end-mark\) and value." | |||
| 2229 | (while (and (not (eolp)) cont) | 2229 | (while (and (not (eolp)) cont) |
| 2230 | ;;(re-search-forward "[^\\?]*\\?") | 2230 | ;;(re-search-forward "[^\\?]*\\?") |
| 2231 | (re-search-forward "[^\\?]*\\(\\?\\|\n\\)") | 2231 | (re-search-forward "[^\\?]*\\(\\?\\|\n\\)") |
| 2232 | (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\\\?")) | 2232 | (if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\\\?")) |
| 2233 | (setq cont nil)) | 2233 | (setq cont nil)) |
| 2234 | (backward-char 1) | 2234 | (backward-char 1) |
| 2235 | (if (not (looking-at "\n")) (forward-char 1)))) | 2235 | (if (not (looking-at "\n")) (forward-char 1)))) |
| @@ -2325,7 +2325,7 @@ a token has type \(command, address, end-mark\) and value." | |||
| 2325 | (while (and (not (eolp)) cont) | 2325 | (while (and (not (eolp)) cont) |
| 2326 | (re-search-forward "[^/]*\\(/\\|\n\\)") | 2326 | (re-search-forward "[^/]*\\(/\\|\n\\)") |
| 2327 | ;;(re-search-forward "[^/]*/") | 2327 | ;;(re-search-forward "[^/]*/") |
| 2328 | (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\/")) | 2328 | (if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\/")) |
| 2329 | (setq cont nil)))) | 2329 | (setq cont nil)))) |
| 2330 | (setq ex-token | 2330 | (setq ex-token |
| 2331 | (if (= (mark) (point)) "" | 2331 | (if (= (mark) (point)) "" |
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el index b8a2f687598..49983c40a52 100644 --- a/lisp/org/org-pcomplete.el +++ b/lisp/org/org-pcomplete.el | |||
| @@ -82,7 +82,7 @@ The return value is a string naming the thing at point." | |||
| 82 | (not (equal (char-after (point-at-bol)) ?*)) | 82 | (not (equal (char-after (point-at-bol)) ?*)) |
| 83 | (save-excursion | 83 | (save-excursion |
| 84 | (move-beginning-of-line 1) | 84 | (move-beginning-of-line 1) |
| 85 | (skip-chars-backward "[ \t\n]") | 85 | (skip-chars-backward " \t\n") |
| 86 | ;; org-drawer-regexp matches a whole line but while | 86 | ;; org-drawer-regexp matches a whole line but while |
| 87 | ;; looking-back, we just ignore trailing whitespaces | 87 | ;; looking-back, we just ignore trailing whitespaces |
| 88 | (or (looking-back (substring org-drawer-regexp 0 -1) | 88 | (or (looking-back (substring org-drawer-regexp 0 -1) |
diff --git a/lisp/org/org.el b/lisp/org/org.el index e3c78ae90d4..bf7e305b7a0 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -14953,7 +14953,7 @@ When JUST-ALIGN is non-nil, only align tags." | |||
| 14953 | (unless (equal tags "") | 14953 | (unless (equal tags "") |
| 14954 | (let* ((level (save-excursion | 14954 | (let* ((level (save-excursion |
| 14955 | (beginning-of-line) | 14955 | (beginning-of-line) |
| 14956 | (skip-chars-forward "\\*"))) | 14956 | (skip-chars-forward "*"))) |
| 14957 | (offset (if (bound-and-true-p org-indent-mode) | 14957 | (offset (if (bound-and-true-p org-indent-mode) |
| 14958 | (* (1- org-indent-indentation-per-level) | 14958 | (* (1- org-indent-indentation-per-level) |
| 14959 | (1- level)) | 14959 | (1- level)) |
| @@ -20615,7 +20615,7 @@ this numeric value." | |||
| 20615 | (unless inc (setq inc 1)) | 20615 | (unless inc (setq inc 1)) |
| 20616 | (let ((pos (point)) | 20616 | (let ((pos (point)) |
| 20617 | (beg (skip-chars-backward "-+^/*0-9eE.")) | 20617 | (beg (skip-chars-backward "-+^/*0-9eE.")) |
| 20618 | (end (skip-chars-forward "-+^/*0-9eE^.")) nap) | 20618 | (end (skip-chars-forward "-+^/*0-9eE.")) nap) |
| 20619 | (setq nap (buffer-substring-no-properties | 20619 | (setq nap (buffer-substring-no-properties |
| 20620 | (+ pos beg) (+ pos beg end))) | 20620 | (+ pos beg) (+ pos beg end))) |
| 20621 | (delete-region (+ pos beg) (+ pos beg end)) | 20621 | (delete-region (+ pos beg) (+ pos beg end)) |
| @@ -22837,7 +22837,7 @@ assumed to be significant there." | |||
| 22837 | (defun org-fill-line-break-nobreak-p () | 22837 | (defun org-fill-line-break-nobreak-p () |
| 22838 | "Non-nil when a new line at point would create an Org line break." | 22838 | "Non-nil when a new line at point would create an Org line break." |
| 22839 | (save-excursion | 22839 | (save-excursion |
| 22840 | (skip-chars-backward "[ \t]") | 22840 | (skip-chars-backward " \t") |
| 22841 | (skip-chars-backward "\\\\") | 22841 | (skip-chars-backward "\\\\") |
| 22842 | (looking-at "\\\\\\\\\\($\\|[^\\]\\)"))) | 22842 | (looking-at "\\\\\\\\\\($\\|[^\\]\\)"))) |
| 22843 | 22843 | ||
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index d4ee2c38fa8..ef285db57e8 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el | |||
| @@ -768,7 +768,7 @@ this is `comint-dynamic-complete-functions'." | |||
| 768 | (push (point) begins) | 768 | (push (point) begins) |
| 769 | (while | 769 | (while |
| 770 | (progn | 770 | (progn |
| 771 | (skip-chars-forward "^ \t\n\\") | 771 | (skip-chars-forward "^ \t\n") |
| 772 | (when (eq (char-after) ?\\) | 772 | (when (eq (char-after) ?\\) |
| 773 | (forward-char 1) | 773 | (forward-char 1) |
| 774 | (unless (eolp) | 774 | (unless (eolp) |
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 59dc1d0fda6..e01f1e8ecbe 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el | |||
| @@ -767,7 +767,7 @@ the 4 file locations can be clicked on and jumped to." | |||
| 767 | (interactive "d") | 767 | (interactive "d") |
| 768 | (goto-char pos) | 768 | (goto-char pos) |
| 769 | 769 | ||
| 770 | (skip-chars-backward "-a-zA-Z0-9_:./\\") | 770 | (skip-chars-backward "-a-zA-Z0-9_:./\\\\") |
| 771 | (cond | 771 | (cond |
| 772 | ;; special case: looking at a filename:line not at the beginning of a line | 772 | ;; special case: looking at a filename:line not at the beginning of a line |
| 773 | ;; or a simple line reference "at line ..." | 773 | ;; or a simple line reference "at line ..." |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 970c5669c6c..0b6008a5114 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -3507,18 +3507,18 @@ Should be called with the point before leading colon of an attribute." | |||
| 3507 | (defsubst cperl-highlight-charclass (endbracket dashface bsface onec-space) | 3507 | (defsubst cperl-highlight-charclass (endbracket dashface bsface onec-space) |
| 3508 | (let ((l '(1 5 7)) ll lle lll | 3508 | (let ((l '(1 5 7)) ll lle lll |
| 3509 | ;; 2 groups, the first takes the whole match (include \[trnfabe]) | 3509 | ;; 2 groups, the first takes the whole match (include \[trnfabe]) |
| 3510 | (singleChar (concat "\\(" "[^\\\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)"))) | 3510 | (singleChar (concat "\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)"))) |
| 3511 | (while ; look for unescaped - between non-classes | 3511 | (while ; look for unescaped - between non-classes |
| 3512 | (re-search-forward | 3512 | (re-search-forward |
| 3513 | ;; On 19.33, certain simplifications lead | 3513 | ;; On 19.33, certain simplifications lead |
| 3514 | ;; to bugs (as in [^a-z] \\| [trnfabe] ) | 3514 | ;; to bugs (as in [^a-z] \\| [trnfabe] ) |
| 3515 | (concat ; 1: SingleChar (include \[trnfabe]) | 3515 | (concat ; 1: SingleChar (include \[trnfabe]) |
| 3516 | singleChar | 3516 | singleChar |
| 3517 | ;;"\\(" "[^\\\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)" | 3517 | ;;"\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)" |
| 3518 | "\\(" ; 3: DASH SingleChar (match optionally) | 3518 | "\\(" ; 3: DASH SingleChar (match optionally) |
| 3519 | "\\(-\\)" ; 4: DASH | 3519 | "\\(-\\)" ; 4: DASH |
| 3520 | singleChar ; 5: SingleChar | 3520 | singleChar ; 5: SingleChar |
| 3521 | ;;"\\(" "[^\\\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)" | 3521 | ;;"\\(" "[^\\]" "\\|" "\\\\[^cdg-mo-qsu-zA-Z0-9_]" "\\|" "\\\\c." "\\|" "\\\\x" "\\([0-9a-fA-F][0-9a-fA-F]?\\|\\={[0-9a-fA-F]+}\\)" "\\|" "\\\\0?[0-7][0-7]?[0-7]?" "\\|" "\\\\N{[^{}]*}" "\\)" |
| 3522 | "\\)?" | 3522 | "\\)?" |
| 3523 | "\\|" | 3523 | "\\|" |
| 3524 | "\\(" ; 7: other escapes | 3524 | "\\(" ; 7: other escapes |
| @@ -4455,13 +4455,13 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', | |||
| 4455 | ;; Apparently, I can't put \] into a charclass | 4455 | ;; Apparently, I can't put \] into a charclass |
| 4456 | ;; in m]]: m][\\\]\]] produces [\\]] | 4456 | ;; in m]]: m][\\\]\]] produces [\\]] |
| 4457 | ;;; POSIX? [:word:] [:^word:] only inside [] | 4457 | ;;; POSIX? [:word:] [:^word:] only inside [] |
| 4458 | ;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") | 4458 | ;;; "\\=\\(\\\\.\\|[^][\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") |
| 4459 | (while ; look for unescaped ] | 4459 | (while ; look for unescaped ] |
| 4460 | (and argument | 4460 | (and argument |
| 4461 | (re-search-forward | 4461 | (re-search-forward |
| 4462 | (if (eq (char-after b) ?\] ) | 4462 | (if (eq (char-after b) ?\] ) |
| 4463 | "\\=\\(\\\\[^]]\\|[^]\\\\]\\)*\\\\]" | 4463 | "\\=\\(\\\\[^]]\\|[^]\\]\\)*\\\\]" |
| 4464 | "\\=\\(\\\\.\\|[^]\\\\]\\)*]") | 4464 | "\\=\\(\\\\.\\|[^]\\]\\)*]") |
| 4465 | (1- e) 'toend)) | 4465 | (1- e) 'toend)) |
| 4466 | ;; Is this ] an end of POSIX class? | 4466 | ;; Is this ] an end of POSIX class? |
| 4467 | (if (save-excursion | 4467 | (if (save-excursion |
| @@ -4580,7 +4580,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', | |||
| 4580 | ;; Works also if the outside delimiters are (). | 4580 | ;; Works also if the outside delimiters are (). |
| 4581 | (or;;(if (eq (char-after b) ?\) ) | 4581 | (or;;(if (eq (char-after b) ?\) ) |
| 4582 | ;;(re-search-forward | 4582 | ;;(re-search-forward |
| 4583 | ;; "[^\\\\]\\(\\\\\\\\\\)*\\\\)" | 4583 | ;; "[^\\]\\(\\\\\\\\\\)*\\\\)" |
| 4584 | ;; (1- e) 'toend) | 4584 | ;; (1- e) 'toend) |
| 4585 | (search-forward ")" (1- e) 'toend) | 4585 | (search-forward ")" (1- e) 'toend) |
| 4586 | ;;) | 4586 | ;;) |
| @@ -7261,7 +7261,7 @@ One may build such TAGS files from CPerl mode menu." | |||
| 7261 | ".->" ; a->b | 7261 | ".->" ; a->b |
| 7262 | "->" ; a SPACE ->b | 7262 | "->" ; a SPACE ->b |
| 7263 | "\\[-" ; a[-1] | 7263 | "\\[-" ; a[-1] |
| 7264 | "\\\\[&$@*\\\\]" ; \&func | 7264 | "\\\\[&$@*\\]" ; \&func |
| 7265 | "^=" ; =head | 7265 | "^=" ; =head |
| 7266 | "\\$." ; $| | 7266 | "\\$." ; $| |
| 7267 | "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO' | 7267 | "<<[a-zA-Z_'\"`]" ; <<FOO, <<'FOO' |
| @@ -8174,7 +8174,7 @@ We suppose that the regexp is scanned already." | |||
| 8174 | (error "Cannot find `(' which starts a group")) | 8174 | (error "Cannot find `(' which starts a group")) |
| 8175 | (setq done | 8175 | (setq done |
| 8176 | (save-excursion | 8176 | (save-excursion |
| 8177 | (skip-chars-backward "\\") | 8177 | (skip-chars-backward "\\\\") |
| 8178 | (looking-at "\\(\\\\\\\\\\)*("))) | 8178 | (looking-at "\\(\\\\\\\\\\)*("))) |
| 8179 | (or done (forward-char -1))))) | 8179 | (or done (forward-char -1))))) |
| 8180 | 8180 | ||
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el index 3365f647c78..9e712353e99 100644 --- a/lisp/progmodes/ebnf-yac.el +++ b/lisp/progmodes/ebnf-yac.el | |||
| @@ -392,7 +392,7 @@ See documentation for variable `ebnf-yac-lex'." | |||
| 392 | (defun ebnf-yac-skip-spaces () | 392 | (defun ebnf-yac-skip-spaces () |
| 393 | (skip-chars-forward | 393 | (skip-chars-forward |
| 394 | (if ebnf-yac-skip-char | 394 | (if ebnf-yac-skip-char |
| 395 | "\n\r\t !#$&()*+-.0123456789=?@[\\\\]^_`~" | 395 | "-\n\r\t !#$&()*+,.0123456789=?@[\\\\]^_`~" |
| 396 | "\n\r\t ") | 396 | "\n\r\t ") |
| 397 | ebnf-limit) | 397 | ebnf-limit) |
| 398 | (< (point) ebnf-limit)) | 398 | (< (point) ebnf-limit)) |
diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el index 2d9dd047a39..dbf7561944e 100644 --- a/lisp/progmodes/flymake-proc.el +++ b/lisp/progmodes/flymake-proc.el | |||
| @@ -1133,7 +1133,7 @@ Use CREATE-TEMP-F for creating temp copy." | |||
| 1133 | (let* ((temp-master-file-name (flymake-proc--init-create-temp-source-and-master-buffer-copy | 1133 | (let* ((temp-master-file-name (flymake-proc--init-create-temp-source-and-master-buffer-copy |
| 1134 | 'flymake-proc-get-include-dirs-dot 'flymake-proc-create-temp-inplace | 1134 | 'flymake-proc-get-include-dirs-dot 'flymake-proc-create-temp-inplace |
| 1135 | '("\\.tex\\'") | 1135 | '("\\.tex\\'") |
| 1136 | "[ \t]*\\in\\(?:put\\|clude\\)[ \t]*{\\(.*%s\\)}"))) | 1136 | "[ \t]*in\\(?:put\\|clude\\)[ \t]*{\\(.*%s\\)}"))) |
| 1137 | (when temp-master-file-name | 1137 | (when temp-master-file-name |
| 1138 | (flymake-proc--get-tex-args temp-master-file-name)))) | 1138 | (flymake-proc--get-tex-args temp-master-file-name)))) |
| 1139 | 1139 | ||
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 830d7009633..d6cd370dac4 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el | |||
| @@ -420,7 +420,7 @@ region is invalid." | |||
| 420 | (beg) | 420 | (beg) |
| 421 | (progn | 421 | (progn |
| 422 | (end-of-line) | 422 | (end-of-line) |
| 423 | (skip-chars-backward " \t\f\t\n" beg) | 423 | (skip-chars-backward " \t\f\n" beg) |
| 424 | (if (eq (point) beg) | 424 | (if (eq (point) beg) |
| 425 | (line-beginning-position 2) | 425 | (line-beginning-position 2) |
| 426 | (point))))) | 426 | (point))))) |
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index b8aa521cf66..152667040fa 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el | |||
| @@ -1795,7 +1795,7 @@ non-indentation text within the comment." | |||
| 1795 | (goto-char (match-end 0))) | 1795 | (goto-char (match-end 0))) |
| 1796 | (t | 1796 | (t |
| 1797 | ;; Move past line number. | 1797 | ;; Move past line number. |
| 1798 | (skip-chars-forward "[ \t0-9]"))) | 1798 | (skip-chars-forward " \t0-9"))) |
| 1799 | ;; Move past whitespace. | 1799 | ;; Move past whitespace. |
| 1800 | (skip-chars-forward " \t") | 1800 | (skip-chars-forward " \t") |
| 1801 | (current-column))) | 1801 | (current-column))) |
diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el index 8a50b9b5375..51c9117cd41 100644 --- a/lisp/progmodes/idlw-complete-structtag.el +++ b/lisp/progmodes/idlw-complete-structtag.el | |||
| @@ -128,7 +128,7 @@ an up-to-date completion list." | |||
| 128 | ;; x[i+4].name.g*. But it is complicated because we would have | 128 | ;; x[i+4].name.g*. But it is complicated because we would have |
| 129 | ;; to really parse this expression. For now, we allow only | 129 | ;; to really parse this expression. For now, we allow only |
| 130 | ;; substructures, like "aaa.bbb.ccc.ddd" | 130 | ;; substructures, like "aaa.bbb.ccc.ddd" |
| 131 | (skip-chars-backward "[a-zA-Z0-9._$]") | 131 | (skip-chars-backward "a-zA-Z0-9._$") |
| 132 | (setq start (point)) ;; remember the start of the completion pos. | 132 | (setq start (point)) ;; remember the start of the completion pos. |
| 133 | (and (< (point) pos) | 133 | (and (< (point) pos) |
| 134 | (not (equal (char-before) ?!)) ; no sysvars | 134 | (not (equal (char-before) ?!)) ; no sysvars |
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 5ff22571b90..bded09d5038 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el | |||
| @@ -7590,7 +7590,7 @@ property indicating the link is added." | |||
| 7590 | (case-fold-search t)) | 7590 | (case-fold-search t)) |
| 7591 | (cond ((save-excursion | 7591 | (cond ((save-excursion |
| 7592 | ;; Check if the context is right for system variable | 7592 | ;; Check if the context is right for system variable |
| 7593 | (skip-chars-backward "[a-zA-Z0-9_$]") | 7593 | (skip-chars-backward "a-zA-Z0-9_$") |
| 7594 | (equal (char-before) ?!)) | 7594 | (equal (char-before) ?!)) |
| 7595 | (setq idlwave-completion-help-info '(idlwave-complete-sysvar-help)) | 7595 | (setq idlwave-completion-help-info '(idlwave-complete-sysvar-help)) |
| 7596 | (idlwave-complete-in-buffer 'sysvar 'sysvar | 7596 | (idlwave-complete-in-buffer 'sysvar 'sysvar |
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 0bc365fcf0f..296a7ac3c95 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el | |||
| @@ -2826,7 +2826,7 @@ STRING should be given if the last search was by `string-match' on STRING." | |||
| 2826 | (progn | 2826 | (progn |
| 2827 | (if (and (eq prolog-system 'mercury) | 2827 | (if (and (eq prolog-system 'mercury) |
| 2828 | (looking-at | 2828 | (looking-at |
| 2829 | (format ":-[ \t]*\\(pred\\|mode\\)[ \t]+\\(%s+\\)" | 2829 | (format ":-[ \t]*\\(pred\\|mode\\)[ \t]+\\(\\(?:%s\\)+\\)" |
| 2830 | prolog-atom-regexp))) | 2830 | prolog-atom-regexp))) |
| 2831 | ;; Skip predicate declarations | 2831 | ;; Skip predicate declarations |
| 2832 | (progn | 2832 | (progn |
| @@ -2950,7 +2950,7 @@ objects (relevant only if `prolog-system' is set to `sicstus')." | |||
| 2950 | (predname | 2950 | (predname |
| 2951 | (if (looking-at prolog-atom-char-regexp) | 2951 | (if (looking-at prolog-atom-char-regexp) |
| 2952 | (progn | 2952 | (progn |
| 2953 | (skip-chars-forward "^ (\\.") | 2953 | (skip-chars-forward "^ (.") |
| 2954 | (buffer-substring op (point))) | 2954 | (buffer-substring op (point))) |
| 2955 | "")) | 2955 | "")) |
| 2956 | (arity 0)) | 2956 | (arity 0)) |
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 5998ac8e395..4fceda89373 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -1490,7 +1490,7 @@ With ARG, do it many times. Negative ARG means move backward." | |||
| 1490 | (cond ((looking-at "\\?\\(\\\\[CM]-\\)*\\\\?\\S ") | 1490 | (cond ((looking-at "\\?\\(\\\\[CM]-\\)*\\\\?\\S ") |
| 1491 | (goto-char (match-end 0))) | 1491 | (goto-char (match-end 0))) |
| 1492 | ((progn | 1492 | ((progn |
| 1493 | (skip-chars-forward ",.:;|&^~=!?\\+\\-\\*") | 1493 | (skip-chars-forward "-,.:;|&^~=!?+*") |
| 1494 | (looking-at "\\s(")) | 1494 | (looking-at "\\s(")) |
| 1495 | (goto-char (scan-sexps (point) 1))) | 1495 | (goto-char (scan-sexps (point) 1))) |
| 1496 | ((and (looking-at (concat "\\<\\(" ruby-block-beg-re | 1496 | ((and (looking-at (concat "\\<\\(" ruby-block-beg-re |
| @@ -1533,7 +1533,7 @@ With ARG, do it many times. Negative ARG means move forward." | |||
| 1533 | (let ((i (or arg 1))) | 1533 | (let ((i (or arg 1))) |
| 1534 | (condition-case nil | 1534 | (condition-case nil |
| 1535 | (while (> i 0) | 1535 | (while (> i 0) |
| 1536 | (skip-chars-backward " \t\n,.:;|&^~=!?\\+\\-\\*") | 1536 | (skip-chars-backward "- \t\n,.:;|&^~=!?+*") |
| 1537 | (forward-char -1) | 1537 | (forward-char -1) |
| 1538 | (cond ((looking-at "\\s)") | 1538 | (cond ((looking-at "\\s)") |
| 1539 | (goto-char (scan-sexps (1+ (point)) -1)) | 1539 | (goto-char (scan-sexps (1+ (point)) -1)) |
| @@ -1546,7 +1546,7 @@ With ARG, do it many times. Negative ARG means move forward." | |||
| 1546 | ((looking-at "\\s\"\\|\\\\\\S_") | 1546 | ((looking-at "\\s\"\\|\\\\\\S_") |
| 1547 | (let ((c (char-to-string (char-before (match-end 0))))) | 1547 | (let ((c (char-to-string (char-before (match-end 0))))) |
| 1548 | (while (and (search-backward c) | 1548 | (while (and (search-backward c) |
| 1549 | (eq (logand (skip-chars-backward "\\") 1) | 1549 | (eq (logand (skip-chars-backward "\\\\") 1) |
| 1550 | 1)))) | 1550 | 1)))) |
| 1551 | nil) | 1551 | nil) |
| 1552 | ((looking-at "\\s.\\|\\s\\") | 1552 | ((looking-at "\\s.\\|\\s\\") |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index f9c3177be41..9e241c70e76 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el | |||
| @@ -10494,7 +10494,7 @@ Presumes that any newlines end a list element." | |||
| 10494 | (looking-at "[(,]"))) | 10494 | (looking-at "[(,]"))) |
| 10495 | (not (save-excursion ; Not `endif, or user define | 10495 | (not (save-excursion ; Not `endif, or user define |
| 10496 | (backward-char 1) | 10496 | (backward-char 1) |
| 10497 | (skip-chars-backward "[a-zA-Z0-9_`]") | 10497 | (skip-chars-backward "a-zA-Z0-9_`") |
| 10498 | (looking-at "`")))) | 10498 | (looking-at "`")))) |
| 10499 | (insert ",")))) | 10499 | (insert ",")))) |
| 10500 | 10500 | ||
diff --git a/lisp/term.el b/lisp/term.el index 693362cc734..586a887a29f 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -1984,8 +1984,8 @@ A useful command to bind to SPC. See `term-replace-by-expanded-history'." | |||
| 1984 | (defun term-within-quotes (beg end) | 1984 | (defun term-within-quotes (beg end) |
| 1985 | "Return t if the number of quotes between BEG and END is odd. | 1985 | "Return t if the number of quotes between BEG and END is odd. |
| 1986 | Quotes are single and double." | 1986 | Quotes are single and double." |
| 1987 | (let ((countsq (term-how-many-region "\\(^\\|[^\\\\]\\)'" beg end)) | 1987 | (let ((countsq (term-how-many-region "\\(^\\|[^\\]\\)'" beg end)) |
| 1988 | (countdq (term-how-many-region "\\(^\\|[^\\\\]\\)\"" beg end))) | 1988 | (countdq (term-how-many-region "\\(^\\|[^\\]\\)\"" beg end))) |
| 1989 | (or (= (mod countsq 2) 1) (= (mod countdq 2) 1)))) | 1989 | (or (= (mod countsq 2) 1) (= (mod countdq 2) 1)))) |
| 1990 | 1990 | ||
| 1991 | (defun term-how-many-region (regexp beg end) | 1991 | (defun term-how-many-region (regexp beg end) |
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el index 81dfb6c99c0..7a5d3ef7758 100644 --- a/lisp/textmodes/bib-mode.el +++ b/lisp/textmodes/bib-mode.el | |||
| @@ -198,7 +198,7 @@ named by variable `unread-bib-file'." | |||
| 198 | 198 | ||
| 199 | (defvar bib-capitalize-title-stop-words | 199 | (defvar bib-capitalize-title-stop-words |
| 200 | (concat | 200 | (concat |
| 201 | "the\\|and\\|of\\|is\\|a\\|an\\|of\\|for\\|in\\|to\\|in\\|on\\|at\\|" | 201 | "the\\|and\\|of\\|is\\|a\\|an\\|for\\|in\\|to\\|on\\|at\\|" |
| 202 | "by\\|with\\|that\\|its") | 202 | "by\\|with\\|that\\|its") |
| 203 | "Words not to be capitalized in a title (unless the first word).") | 203 | "Words not to be capitalized in a title (unless the first word).") |
| 204 | 204 | ||
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el index f8013c73bb2..3ba52e61ea6 100644 --- a/lisp/textmodes/refbib.el +++ b/lisp/textmodes/refbib.el | |||
| @@ -137,7 +137,7 @@ This is in addition to the `r2b-capitalize-title-stop-words'.") | |||
| 137 | 137 | ||
| 138 | (defvar r2b-capitalize-title-stop-words | 138 | (defvar r2b-capitalize-title-stop-words |
| 139 | (concat | 139 | (concat |
| 140 | "the\\|and\\|of\\|is\\|a\\|an\\|of\\|for\\|in\\|to\\|in\\|on\\|at\\|" | 140 | "the\\|and\\|of\\|is\\|a\\|an\\|for\\|in\\|to\\|on\\|at\\|" |
| 141 | "by\\|with\\|that\\|its") | 141 | "by\\|with\\|that\\|its") |
| 142 | "Words not to be capitalized in a title (unless the first word).") | 142 | "Words not to be capitalized in a title (unless the first word).") |
| 143 | 143 | ||
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 2f9b7268fc8..005816e9659 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el | |||
| @@ -1000,7 +1000,7 @@ OPT-ARGS is a list of argument numbers which are optional." | |||
| 1000 | (eq (following-char) ?\{)) | 1000 | (eq (following-char) ?\{)) |
| 1001 | (cl-incf cnt))) | 1001 | (cl-incf cnt))) |
| 1002 | (if (and (= n cnt) | 1002 | (if (and (= n cnt) |
| 1003 | (> (skip-chars-forward "{\\[") 0)) | 1003 | (> (skip-chars-forward "{[") 0)) |
| 1004 | (reftex-context-substring) | 1004 | (reftex-context-substring) |
| 1005 | nil)))) | 1005 | nil)))) |
| 1006 | 1006 | ||
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 0fc2f170a67..ba5d7e4f46f 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el | |||
| @@ -225,7 +225,7 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match." | |||
| 225 | "The SVN revision of this file. | 225 | "The SVN revision of this file. |
| 226 | SVN revision is the upstream (docutils) revision.") | 226 | SVN revision is the upstream (docutils) revision.") |
| 227 | (defconst rst-svn-timestamp | 227 | (defconst rst-svn-timestamp |
| 228 | (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " " | 228 | (rst-extract-version "\\$" "LastChangedDate: " ".+" " " |
| 229 | "$LastChangedDate: 2017-01-08 10:54:35 +0100 (Sun, 08 Jan 2017) $") | 229 | "$LastChangedDate: 2017-01-08 10:54:35 +0100 (Sun, 08 Jan 2017) $") |
| 230 | "The SVN time stamp of this file.") | 230 | "The SVN time stamp of this file.") |
| 231 | 231 | ||
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 651a2cc94c6..46baa8a1482 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el | |||
| @@ -513,7 +513,7 @@ Return the number of characters removed." | |||
| 513 | (url-http-debug "url-http-parse-response called in (%s)" (buffer-name)) | 513 | (url-http-debug "url-http-parse-response called in (%s)" (buffer-name)) |
| 514 | (goto-char (point-min)) | 514 | (goto-char (point-min)) |
| 515 | (skip-chars-forward " \t\n") ; Skip any blank crap | 515 | (skip-chars-forward " \t\n") ; Skip any blank crap |
| 516 | (skip-chars-forward "HTTP/") ; Skip HTTP Version | 516 | (skip-chars-forward "/HPT") ; Skip HTTP Version "HTTP/". |
| 517 | (setq url-http-response-version | 517 | (setq url-http-response-version |
| 518 | (buffer-substring (point) | 518 | (buffer-substring (point) |
| 519 | (progn | 519 | (progn |
diff --git a/test/lisp/progmodes/f90-tests.el b/test/lisp/progmodes/f90-tests.el index 3cd7392bbc4..b1642388413 100644 --- a/test/lisp/progmodes/f90-tests.el +++ b/test/lisp/progmodes/f90-tests.el | |||
| @@ -98,7 +98,7 @@ end subroutine test") | |||
| 98 | (insert "(/ x /)") | 98 | (insert "(/ x /)") |
| 99 | (f90-do-auto-fill) | 99 | (f90-do-auto-fill) |
| 100 | (beginning-of-line) | 100 | (beginning-of-line) |
| 101 | (skip-chars-forward "[ \t]") | 101 | (skip-chars-forward " \t") |
| 102 | (should (equal "&(/" (buffer-substring (point) (+ 3 (point))))))) | 102 | (should (equal "&(/" (buffer-substring (point) (+ 3 (point))))))) |
| 103 | 103 | ||
| 104 | ;; TODO bug#5593 | 104 | ;; TODO bug#5593 |