From: Karl Heuer Date: Sat, 12 Mar 1994 00:23:12 +0000 (+0000) Subject: Don't use triple-hyphen in a character class. X-Git-Tag: emacs-19.34~9543 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26add1bf463d21a7dc855798911eae45e96fa202;p=emacs.git Don't use triple-hyphen in a character class. --- diff --git a/lisp/add-log.el b/lisp/add-log.el index 9c54caa84ce..0fc40e107a4 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -284,7 +284,7 @@ Prefix arg means justify as well." (fill-paragraph justify))) (defvar add-log-current-defun-header-regexp - "^\\([A-Z][A-Z_ ]*[A-Z_]\\|[a-z_---A-Z]+\\)[ \t]*[:=]" + "^\\([A-Z][A-Z_ ]*[A-Z_]\\|[-_a-zA-Z]+\\)[ \t]*[:=]" "*Heuristic regexp used by `add-log-current-defun' for unknown major modes.") (defun add-log-current-defun () diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el index 2d2cd2fa296..a0fc2a2307b 100644 --- a/lisp/ange-ftp.el +++ b/lisp/ange-ftp.el @@ -857,7 +857,7 @@ SIZE, if supplied, should be a prime number." ;;;; Internal variables. ;;;; ------------------------------------------------------------ -(defconst ange-ftp-version "$Revision: 1.42 $") +(defconst ange-ftp-version "$Revision: 1.43 $") (defvar ange-ftp-data-buffer-name " *ftp data*" "Buffer name to hold directory listing data received from ftp process.") @@ -4502,8 +4502,8 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") (defconst ange-ftp-vms-filename-regexp (concat - "\\(\\([_A-Za-z0-9$]?\\|[_A-Za-z0-9$][_A-Za-z0-9$---]*\\)\\." - "[_A-Za-z0-9$---]*;+[0-9]*\\)") + "\\(\\([_A-Za-z0-9$]?\\|[_A-Za-z0-9$][-_A-Za-z0-9$]*\\)\\." + "[-_A-Za-z0-9$]*;+[0-9]*\\)") "Regular expression to match for a valid VMS file name in Dired buffer. Stupid freaking bug! Position of _ and $ shouldn't matter but they do. Having [A-Z0-9$_] bombs on filename _$$CHANGE_LOG$.TXT$ and $CHANGE_LOG$.TX diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 99e0063a94a..0959ee0f1d4 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -279,7 +279,7 @@ with a prefix argument." ;; Quote everything except POSIX filename characters. ;; This should be safe enough even for really weird shells. (let ((result "") (start 0) end) - (while (string-match "[^---0-9a-zA-Z_./]" filename start) + (while (string-match "[^-0-9a-zA-Z_./]" filename start) (setq end (match-beginning 0) result (concat result (substring filename start end) "\\" (substring filename end (1+ end))) diff --git a/lisp/dired.el b/lisp/dired.el index be4972fa739..be82cb872b7 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2061,7 +2061,7 @@ With a prefix argument you can edit the current listing switches instead." (let (case-fold-search) (concat "-l" - (dired-replace-in-string (concat "[---lt" + (dired-replace-in-string (concat "[-lt" dired-ls-sorting-switches "]") "" dired-actual-switches) diff --git a/lisp/files.el b/lisp/files.el index 8f33ee8d975..7b1c3cbec89 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1330,8 +1330,8 @@ we do not remove backup version numbers, only true file version numbers." ;; sign, zero or more digits, provided this is the ;; second period encountered outside of the ;; device/directory part of the file name. - (or (string-match ";[---+]?[0-9]*\\'" name) - (if (string-match "\\.[^]>:]*\\(\\.[---+]?[0-9]*\\)\\'" + (or (string-match ";[-+]?[0-9]*\\'" name) + (if (string-match "\\.[^]>:]*\\(\\.[-+]?[0-9]*\\)\\'" name) (match-beginning 1)) (length name)) diff --git a/lisp/gnus.el b/lisp/gnus.el index 44ff621ebbb..ed34f87e5e5 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1987, 1988, 1989, 1990, 1993 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA -;; Version: $Header: /gd/gnu/emacs/19.0/lisp/RCS/gnus.el,v 1.32 1994/01/08 12:46:53 rms Exp kwzh $ +;; Version: $Header: /gd/gnu/emacs/19.0/lisp/RCS/gnus.el,v 1.33 1994/02/11 21:56:45 kwzh Exp kwzh $ ;; Keywords: news ;; This file is part of GNU Emacs. @@ -2350,7 +2350,7 @@ the same subject will be searched for." (regexp (format "^%s[ \t]+\\([0-9]+\\):.\\[[^]\r\n]*\\][ \t]+%s" ;;(if unread " " ".") - (cond ((eq unread t) " ") (unread "[ ---]") (t ".")) + (cond ((eq unread t) " ") (unread "[- ]") (t ".")) (if subject (concat "\\([Rr][Ee]:[ \t]+\\)*" (regexp-quote (gnus-simplify-subject subject)) @@ -3318,7 +3318,7 @@ Argument COUNT specifies number of articles unmarked" (let ((buffer-read-only nil)) (save-excursion (goto-char (point-min)) - (delete-non-matching-lines "^[ ---]")) + (delete-non-matching-lines "^[- ]")) ;; Adjust point. (if (eobp) (gnus-summary-prev-subject 1) @@ -6635,7 +6635,7 @@ If optional argument RAWFILE is non-nil, the raw startup file is read." ;; Parse each newsgroup description such as "comp.all". Commas ;; and white spaces can be a newsgroup separator. (while - (string-match "^[ \t\n,]*\\(!?\\)\\([^--- \t\n,][^ \t\n,]*\\)" options) + (string-match "^[ \t\n,]*\\(!?\\)\\([^- \t\n,][^ \t\n,]*\\)" options) (setq yes-or-no (substring options (match-beginning 1) (match-end 1))) (setq newsgroup diff --git a/lisp/progmodes/cplus-md.el b/lisp/progmodes/cplus-md.el index 613253e7b68..af26f52138c 100644 --- a/lisp/progmodes/cplus-md.el +++ b/lisp/progmodes/cplus-md.el @@ -797,7 +797,7 @@ The fill lines remain a comment." ;; ;; ; overloadable operators ;; (op-sym1 -;; "[---+*/%^&|~!=<>]\\|[---+*/%^&|<>=!]=\\|<<=?\\|>>=?") +;; "[-+*/%^&|~!=<>]\\|[-+*/%^&|<>=!]=\\|<<=?\\|>>=?") ;; (op-sym2 ;; "&&\\|||\\|\\+\\+\\|--\\|()\\|\\[\\]") ;; (op-sym (concat "\\(" op-sym1 "\\|" op-sym2 "\\)")) diff --git a/lisp/subr.el b/lisp/subr.el index 44a7e298e3c..42105a44d56 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -671,7 +671,7 @@ Wildcards and redirection are handled as usual in the shell." ;; Quote everything except POSIX filename characters. ;; This should be safe enough even for really weird shells. (let ((result "") (start 0) end) - (while (string-match "[^---0-9a-zA-Z_./]" argument start) + (while (string-match "[^-0-9a-zA-Z_./]" argument start) (setq end (match-beginning 0) result (concat result (substring argument start end) "\\" (substring argument end (1+ end))) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 2fa5fae1d3a..1050b494dc8 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -388,30 +388,30 @@ started ispell process.") ;;;###autoload (defvar ispell-dictionary-alist ; sk 9-Aug-1991 18:28 '((nil ; default (english.aff) - "[A-Za-z]" "[^A-Za-z]" "[---']" nil ("-B") nil) + "[A-Za-z]" "[^A-Za-z]" "[-']" nil ("-B") nil) ("english" ; make english explicitly selectable - "[A-Za-z]" "[^A-Za-z]" "[---']" nil ("-B") nil) + "[A-Za-z]" "[^A-Za-z]" "[-']" nil ("-B") nil) ("deutsch" ; deutsch.aff - "[a-zA-Z\"]" "[^a-zA-Z\"]" "[---']" t ("-C") nil) + "[a-zA-Z\"]" "[^a-zA-Z\"]" "[-']" t ("-C") nil) ("deutsch8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" - "[---']" t ("-C" "-d" "deutsch") "~latin1") + "[-']" t ("-C" "-d" "deutsch") "~latin1") ("nederlands8" ; dutch8.aff "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]" - "[---']" t ("-C") nil) + "[-']" t ("-C") nil) ("svenska" ;7 bit swedish mode "[A-Za-z}{|\\133\\135\\\\]" "[^A-Za-z}{|\\133\\135\\\\]" - "[---']" nil ("-C") nil) + "[-']" nil ("-C") nil) ("svenska8" ;8 bit swedish mode "[A-Za-z\345\344\366\305\304\366]" "[^A-Za-z\345\344\366\305\304\366]" - "[---']" nil ("-C" "-d" "svenska") "~list") ; Add `"-T" "list"' instead? + "[-']" nil ("-C" "-d" "svenska") "~list") ; Add `"-T" "list"' instead? ("francais" - "[A-Za-z]" "[^A-Za-z]" "[---`'\^]" nil nil nil) + "[A-Za-z]" "[^A-Za-z]" "[-`'\^]" nil nil nil) ("dansk" ; dansk.aff "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]" - "[---]" nil ("-C") nil) + "[-]" nil ("-C") nil) ) "An alist of dictionaries and their associated parameters. @@ -1484,7 +1484,7 @@ With prefix argument, set the default directory." (re-search-forward "[][()$]" limit t)) (setq string (concat "^" (buffer-substring start limit) "\n"))) (goto-char limit)))) - ((looking-at "[---#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS + ((looking-at "[-#@*+!%~^]") ; SKIP SPECIAL ISPELL CHARACTERS (forward-char 1)) ((or (re-search-forward ispell-casechars end t) ; TEXT EXISTS... (re-search-forward "[][()$]" end t)) ; or MATH COMMANDS... @@ -1800,7 +1800,7 @@ news-reply-mode-hook or mail-mode-hook to the following lambda expression: ;;(search-forward mail-header-separator nil t) (while (if internal-messagep (< (point) internal-messagep) - (and (looking-at "[a-zA-Z---]+:\\|\t\\| ") + (and (looking-at "[-a-zA-Z]+:\\|\t\\| ") (not (eobp)))) ;; spell check Subject: field without Re:'s. diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 4ada1087795..fc079976c8b 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -1882,9 +1882,9 @@ Default is to leave paragraph indentation as is." ;; are used to underline it. This could occur if the line following ;; the underlining is not an index entry and has text within it. (let* ((previous-paragraph-separate paragraph-separate) - (paragraph-separate (concat paragraph-separate "\\|^[=*---.]+")) + (paragraph-separate (concat paragraph-separate "\\|^[-=*.]+")) (previous-paragraph-start paragraph-start) - (paragraph-start (concat paragraph-start "\\|^[=*---.]+"))) + (paragraph-start (concat paragraph-start "\\|^[-=*.]+"))) (unwind-protect (fill-paragraph nil) (setq paragraph-separate previous-paragraph-separate)