diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/auth-source-pass.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-datetree.el | 9 | ||||
| -rw-r--r-- | lisp/org/org-pcomplete.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 7 | ||||
| -rw-r--r-- | lisp/textmodes/texnfo-upd.el | 2 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 2 |
8 files changed, 16 insertions, 14 deletions
diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el index 29ff9c66856..4283ed0392b 100644 --- a/lisp/auth-source-pass.el +++ b/lisp/auth-source-pass.el @@ -139,7 +139,7 @@ The secret is the first line of CONTENTS." (defun auth-source-pass--parse-data (contents) "Parse the password-store data in the string CONTENTS and return an alist. CONTENTS is the contents of a password-store formatted file." - (let ((lines (split-string contents "\n" t "\\\s"))) + (let ((lines (split-string contents "\n" t "[ \t]+"))) (seq-remove #'null (mapcar (lambda (line) (let ((pair (mapcar (lambda (s) (string-trim s)) diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el index aea2c8d3d61..b4797de1e58 100644 --- a/lisp/org/org-datetree.el +++ b/lisp/org/org-datetree.el @@ -138,15 +138,16 @@ will be built under the headline at point." "^\\*+[ \t]+%d-%02d-\\([0123][0-9]\\) \\w+$" year month day)))) -(defun org-datetree--find-create (regex year &optional month day insert) - "Find the datetree matched by REGEX for YEAR, MONTH, or DAY. -REGEX is passed to `format' with YEAR, MONTH, and DAY as +(defun org-datetree--find-create + (regex-template year &optional month day insert) + "Find the datetree matched by REGEX-TEMPLATE for YEAR, MONTH, or DAY. +REGEX-TEMPLATE is passed to `format' with YEAR, MONTH, and DAY as arguments. Match group 1 is compared against the specified date component. If INSERT is non-nil and there is no match then it is inserted into the buffer." (when (or month day) (org-narrow-to-subtree)) - (let ((re (format regex year month day)) + (let ((re (format regex-template year month day)) match) (goto-char (point-min)) (while (and (setq match (re-search-forward re nil t)) diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el index 49983c40a52..cf272de90a8 100644 --- a/lisp/org/org-pcomplete.el +++ b/lisp/org/org-pcomplete.el @@ -49,10 +49,10 @@ "Examine the thing at point and let the caller know what it is. The return value is a string naming the thing at point." (let ((beg1 (save-excursion - (skip-chars-backward "[:alnum:]-_@") + (skip-chars-backward "-[:alnum:]_@") (point))) (beg (save-excursion - (skip-chars-backward "a-zA-Z0-9-_:$") + (skip-chars-backward "-a-zA-Z0-9_:$") (point))) (line-to-here (buffer-substring (point-at-bol) (point)))) (cond diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 0b6008a5114..73b55e29a5a 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1884,7 +1884,7 @@ or as help on variables `cperl-tips', `cperl-problems', ;;Point is at start of real comment." ;; (let ((c (current-column)) target cnt prevc) ;; (if (= c comment-column) nil -;; (setq cnt (skip-chars-backward "[ \t]")) +;; (setq cnt (skip-chars-backward " \t")) ;; (setq target (max (1+ (setq prevc ;; (current-column))) ; Else indent at comment column ;; comment-column)) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index f1ec5ceea56..4d91da73340 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1908,7 +1908,7 @@ the same column as the current line." (save-match-data (when (looking-at "\\s-*\\_<while\\_>") (if (save-excursion - (skip-chars-backward "[ \t\n]*}") + (skip-chars-backward " \t\n}") (looking-at "[ \t\n]*}")) (save-excursion (backward-list) (forward-symbol -1) (looking-at "\\_<do\\_>")) diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index e49144e2900..9e3be99af14 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -894,7 +894,7 @@ Return non-nil if we skipped over matched tags." (condition-case err (save-excursion (goto-char end) - (skip-chars-backward "[:alnum:]-_.:") + (skip-chars-backward "-[:alnum:]_.:") (if (and ;; (<= (point) beg) ; This poses problems for downcase-word. (or (eq (char-before) ?<) (and (eq (char-before) ?/) @@ -902,7 +902,7 @@ Return non-nil if we skipped over matched tags." (null (get-char-property (point) 'text-clones))) (let* ((endp (eq (char-before) ?/)) (cl-start (point)) - (cl-end (progn (skip-chars-forward "[:alnum:]-_.:") (point))) + (cl-end (progn (skip-chars-forward "-[:alnum:]_.:") (point))) (match (if endp (when (sgml-skip-tag-backward 1) (forward-char 1) t) @@ -919,7 +919,8 @@ Return non-nil if we skipped over matched tags." (equal (buffer-substring cl-start cl-end) (buffer-substring (point) (save-excursion - (skip-chars-forward "[:alnum:]-_.:") + (skip-chars-forward + "-[:alnum:]_.:") (point)))) (or (not endp) (eq (char-after cl-end) ?>))) (when clones diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index 8c6e23eae4a..e960e992a89 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -642,7 +642,7 @@ appears in the texinfo file." "Return description field of old menu line as string. Point must be located just after the node name. Point left before description. Single argument, END-OF-MENU, is position limiting search." - (skip-chars-forward "[:.,\t\n ]+") + (skip-chars-forward ":.,\t\n ") ;; don't copy a carriage return at line beginning with asterisk! ;; don't copy @detailmenu or @end menu or @ignore as descriptions! ;; do copy a description that begins with an `@'! diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 46baa8a1482..1fbc0870737 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -517,7 +517,7 @@ Return the number of characters removed." (setq url-http-response-version (buffer-substring (point) (progn - (skip-chars-forward "[0-9].") + (skip-chars-forward "0-9.") (point)))) (setq url-http-response-status (read (current-buffer)))) |