diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-17 12:28:45 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-17 12:39:54 -0700 |
| commit | 753fbfbef484272bcde5214f75fb0846ee3f33df (patch) | |
| tree | c525c0d926a4a3f66d323079218ffebfa3a867df | |
| parent | dc9e7022d5f259642a42535a4db87d2a1d05ae19 (diff) | |
Fix several backslash typos in Elisp strings
* lisp/calendar/todo-mode.el (todo-files, todo-rename-file)
(todo-find-filtered-items-file, todo-reset-nondiary-marker)
(todo-reset-done-string, todo-reset-comment-string)
(todo-reset-highlight-item):
* lisp/erc/erc-networks.el (erc-networks-alist):
* lisp/gnus/gnus-art.el (gnus-button-handle-library):
* lisp/gnus/gnus-group.el (gnus-read-ephemeral-gmane-group-url):
* lisp/gnus/nntp.el (nntp-via-shell-prompt)
(nntp-telnet-shell-prompt):
* lisp/gnus/spam-report.el (spam-report-gmane-regex):
* lisp/image-dired.el (image-dired-rotate-original):
(image-dired-get-exif-file-name):
* lisp/international/latin1-disp.el (latin1-display-ucs-per-lynx):
* lisp/mail/undigest.el (rmail-digest-parse-rfc1153strict):
* lisp/mh-e/mh-letter.el (mh-file-is-vcard-p):
* lisp/mh-e/mh-mime.el (mh-file-mime-type-substitutions):
* lisp/net/shr-color.el (shr-color->hexadecimal):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-docview.el (org-docview-export):
* lisp/org/org-entities.el (org-entities):
* lisp/org/ox-icalendar.el (org-icalendar-cleanup-string):
* lisp/progmodes/cperl-mode.el (cperl-indent-exp):
* lisp/progmodes/ebnf2ps.el (ebnf-file-suffix-regexp)
(ebnf-style-database):
* lisp/progmodes/idlw-help.el (idlwave-do-context-help1):
* lisp/progmodes/ruby-mode.el (ruby-imenu-create-index-in-block):
* lisp/progmodes/sql.el (sql-product-alist):
* lisp/progmodes/verilog-mode.el (verilog-error-regexp-emacs-alist)
(verilog-error-font-lock-keywords)
(verilog-assignment-operator-re):
* lisp/progmodes/vhdl-mode.el (vhdl-compiler-alist):
* lisp/textmodes/reftex-parse.el (reftex-parse-from-file):
* lisp/vc/add-log.el (change-log-version-number-regexp-list):
Fix typo by replacing ‘\’ with ‘\\’ in a string literal.
For example, to get the regular expression ‘\.’ use the string
literal "\\.", not "\." (which is equivalent to ".").
* lisp/emulation/viper-util.el (viper-glob-unix-files):
Remove stray ‘\j’ from string.
* lisp/gnus/nntp.el (nntp-via-shell-prompt)
(nntp-telnet-shell-prompt):
Treat > like $ when matching a shell prompt.
* lisp/progmodes/make-mode.el (makefile-browse):
Properly quote a diagnostic.
38 files changed, 87 insertions, 87 deletions
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index a04bf8237d..2949e3b79b 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -74,7 +74,7 @@ truenames (those with the extension \".toda\")." (let ((files (if (file-exists-p todo-directory) (mapcar 'file-truename (directory-files todo-directory t - (if archives "\.toda$" "\.todo$") t))))) + (if archives "\\.toda$" "\\.todo$") t))))) (sort files (lambda (s1 s2) (let ((cis1 (upcase s1)) (cis2 (upcase s2))) (string< cis1 cis2)))))) @@ -1112,7 +1112,7 @@ these files, also rename them accordingly." (snname (todo-short-file-name nname)) (files (directory-files todo-directory t (concat ".*" (regexp-quote soname) - ".*\.tod[aorty]$") t))) + ".*\\.tod[aorty]$") t))) (dolist (f files) (let* ((sfname (todo-short-file-name f)) (fext (file-name-extension f t)) @@ -3963,7 +3963,7 @@ regexp items." (defun todo-find-filtered-items-file () "Choose a filtered items file and visit it." (interactive) - (let ((files (directory-files todo-directory t "\.tod[rty]$" t)) + (let ((files (directory-files todo-directory t "\\.tod[rty]$" t)) falist file) (dolist (f files) (let ((type (cond ((equal (file-name-extension f) "todr") "regexp") @@ -6022,7 +6022,7 @@ the empty string (i.e., no time string)." "The :set function for user option `todo-nondiary-marker'." (let* ((oldvalue (symbol-value symbol)) (files (append todo-files todo-archives - (directory-files todo-directory t "\.tod[rty]$" t)))) + (directory-files todo-directory t "\\.tod[rty]$" t)))) (custom-set-default symbol value) ;; Need to reset these to get font-locking right. (setq todo-nondiary-start (nth 0 todo-nondiary-marker) @@ -6075,7 +6075,7 @@ the empty string (i.e., no time string)." "The :set function for user option `todo-done-string'." (let ((oldvalue (symbol-value symbol)) (files (append todo-files todo-archives - (directory-files todo-directory t "\.todr$" t)))) + (directory-files todo-directory t "\\.todr$" t)))) (custom-set-default symbol value) ;; Need to reset this to get font-locking right. (setq todo-done-string-start @@ -6104,7 +6104,7 @@ the empty string (i.e., no time string)." "The :set function for user option `todo-comment-string'." (let ((oldvalue (symbol-value symbol)) (files (append todo-files todo-archives - (directory-files todo-directory t "\.todr$" t)))) + (directory-files todo-directory t "\\.todr$" t)))) (custom-set-default symbol value) (when (not (equal value oldvalue)) (dolist (f files) @@ -6130,7 +6130,7 @@ the empty string (i.e., no time string)." "The :set function for user option `todo-highlight-item'." (let ((oldvalue (symbol-value symbol)) (files (append todo-files todo-archives - (directory-files todo-directory t "\.tod[rty]$" t)))) + (directory-files todo-directory t "\\.tod[rty]$" t)))) (custom-set-default symbol value) (when (not (equal value oldvalue)) (dolist (f files) diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el index dfd44ac07c..a8edbe8fbd 100644 --- a/lisp/cedet/ede/proj-shared.el +++ b/lisp/cedet/ede/proj-shared.el @@ -166,7 +166,7 @@ Use ldlibs to add addition libraries.") "%.lo: %.c\n" "\t@echo '$(LTCOMPILE) -c $<'; \\\n" "\t$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<\n" - "\t@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \\\n" + "\t@-sed -e 's/^\\([^:]*\\)\\.o:/\\1.lo \\1.o:/' \\\n" "\t < .deps/$(*F).p > .deps/$(*F).P\n" "\t@-rm -f .deps/$(*F).p\n\n")) ) diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index c4dc569efb..9616fd4e86 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -426,7 +426,7 @@ Otherwise return the normal value." ;; Issue an error, if no match. (unless (eq 0 status) (save-excursion - (skip-chars-forward " \t\n\j") + (skip-chars-forward " \t\n") (if (looking-at "ls:") (viper-forward-Word 1)) (error "%s: %s" diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index 441663f3b3..2891fe17be 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el @@ -588,7 +588,7 @@ PORTS is either a number, a list of numbers, or a list of port ranges." (LagNet "lagnet.org.za") (Librenet "librenet.net") (LinkNet "link-net.org") - (LinuxChix "cats\.meow\.at\\|linuxchix\.org") + (LinuxChix "cats\\.meow\\.at\\|linuxchix\\.org") (Liquidized "liquidized.net") (M-IRC "m-sys.org") (MagicStar "magicstar.net") diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 62be63e9aa..b7e880c120 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -258,20 +258,20 @@ If nil, only \"> \" will be shown." (defcustom erc-hide-list nil "A global list of IRC message types to hide. -A typical value would be '(\"JOIN\" \"PART\" \"QUIT\")." +A typical value would be \(\"JOIN\" \"PART\" \"QUIT\")." :group 'erc-ignore :type 'erc-message-type) (defcustom erc-network-hide-list nil "A list of IRC networks to hide message types from. -A typical value would be '((\"freenode\" \"MODE\") +A typical value would be \((\"freenode\" \"MODE\") (\"OFTC\" \"JOIN\" \"QUIT\"))." :group 'erc-ignore :type 'erc-message-type) (defcustom erc-channel-hide-list nil "A list of IRC channels to hide message types from. -A typical value would be '((\"#emacs\" \"QUIT\" \JOIN\") +A typical value would be \((\"#emacs\" \"QUIT\" \"JOIN\") (\"#erc\" \"NICK\")." :group 'erc-ignore :type 'erc-message-type) @@ -2503,7 +2503,7 @@ non-nil." (defcustom erc-lurker-hide-list nil "List of IRC type messages to hide when sent by lurkers. -A typical value would be '(\"JOIN\" \"PART\" \"QUIT\"). +A typical value would be \(\"JOIN\" \"PART\" \"QUIT\"). See also `erc-lurker-p' and `erc-hide-list'." :group 'erc-lurker :type 'erc-message-type) diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index f2e67cc8c3..f0a8515238 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -193,8 +193,8 @@ The basic syntax is: * .* matches any group of characters (or none) # * matches zero or more occurrences of preceding ## + matches one or more occurrences of preceding - (x) \(x\) makes `x' a regular expression group - | \| boolean OR within an expression group + (x) \\(x\\) makes `x' a regular expression group + | \\| boolean OR within an expression group [a-b] [a-b] matches a character or range [^a] [^a] excludes a character or range diff --git a/lisp/format.el b/lisp/format.el index dbc814e5b0..96591a70a1 100644 --- a/lisp/format.el +++ b/lisp/format.el @@ -513,7 +513,7 @@ Optional args BEG and END specify a region of the buffer on which to operate." (defun format-delq-cons (cons list) "Remove the given CONS from LIST by side effect and return the new LIST. Since CONS could be the first element of LIST, write -`\(setq foo \(format-delq-cons element foo))' to be sure of changing +\(setq foo \(format-delq-cons element foo)) to be sure of changing the value of `foo'." (if (eq cons list) (cdr list) @@ -827,7 +827,7 @@ in the region, it is treated as though it were DEFAULT." Insert each element of the given LIST of buffer annotations at its appropriate place. Use second arg OFFSET if the annotations' locations are not relative to the beginning of the buffer: annotations will be inserted -at their location-OFFSET+1 \(ie, the offset is treated as the position of +at their location-OFFSET+1 \(i.e., the offset is treated as the position of the first character in the buffer)." (if (not offset) (setq offset 0) diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index 3f426bf95f..01cb3bf93b 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -362,7 +362,7 @@ If the value is not a list, symmetric encryption will be used." "Read one of CHOICES by `read-char-choice', or `read-char'. `dropdown-list' support is disabled because it doesn't work reliably. Only one of CHOICES will be returned. The PROMPT is augmented -with \"[a/b/c] \" if CHOICES is '\(?a ?b ?c\)." +with \"[a/b/c] \" if CHOICES is \(?a ?b ?c)." (when choices (let* ((prompt-choices (apply 'concat (loop for c in choices diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 8ad81c9fc3..c256834dc2 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -7724,7 +7724,7 @@ Calls `describe-variable' or `describe-function'." "Call `locate-library' when pushing the corresponding URL button." (gnus-message 9 "url=`%s'" url) (let* ((lib (locate-library url)) - (file (gnus-replace-in-string (or lib "") "\.elc" ".el"))) + (file (gnus-replace-in-string (or lib "") "\\.elc" ".el"))) (if (not lib) (gnus-message 1 "Cannot locale library `%s'." url) (find-file-read-only file)))) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index ad49824f02..21cb1b8b13 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2435,7 +2435,7 @@ Valid input formats include: ;; URLs providing `group', `start' and `range': ((string-match ;; http://thread.gmane.org/gmane.emacs.devel/86326/focus=86525 - "^http://thread\.gmane\.org/\\([^/]+\\)/\\([0-9]+\\)/focus=\\([0-9]+\\)$" + "^http://thread\\.gmane\\.org/\\([^/]+\\)/\\([0-9]+\\)/focus=\\([0-9]+\\)$" url) (setq group (match-string 1 url) start (string-to-number (match-string 2 url)) @@ -2446,15 +2446,15 @@ Valid input formats include: ;; URLs providing `group' and `start': ((or (string-match ;; http://article.gmane.org/gmane.comp.gnu.make.bugs/3584 - "^http://\\(?:thread\\|article\\|permalink\\)\.gmane\.org/\\([^/]+\\)/\\([0-9]+\\)" + "^http://\\(?:thread\\|article\\|permalink\\)\\.gmane\\.org/\\([^/]+\\)/\\([0-9]+\\)" url) (string-match ;; Don't advertise these in the doc string yet: - "^\\(?:nntp\\|news\\)://news\.gmane\.org/\\([^/]+\\)/\\([0-9]+\\)" + "^\\(?:nntp\\|news\\)://news\\.gmane\\.org/\\([^/]+\\)/\\([0-9]+\\)" url) (string-match ;; http://news.gmane.org/group/gmane.emacs.gnus.general/thread=65099/force_load=t - "^http://news\.gmane\.org/group/\\([^/]+\\)/thread=\\([0-9]+\\)" + "^http://news\\.gmane\\.org/group/\\([^/]+\\)/thread=\\([0-9]+\\)" url)) (setq group (match-string 1 url) start (string-to-number (match-string 2 url)))) diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el index 5b72b52079..3d8926b692 100644 --- a/lisp/gnus/nnmaildir.el +++ b/lisp/gnus/nnmaildir.el @@ -147,7 +147,7 @@ by nnmaildir-request-article.") ;; A NOV structure looks like this (must be prin1-able, so no defstruct): ["subject\tfrom\tdate" - "references\tchars\lines" + "references\tchars\tlines" "To: you\tIn-Reply-To: <your.mess@ge>" (12345 67890) ;; modtime of the corresponding article file (to in-reply-to)] ;; contemporary value of nnmail-extra-headers diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 6c97cecdcd..ec9a66614b 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -175,7 +175,7 @@ This variable is used by the various nntp-open-via-* methods.") "*Whether both telnet client and server support the ENVIRON option. If non-nil, there will be no prompt for a login name.") -(defvoo nntp-via-shell-prompt "bash\\|\$ *\r?$\\|> *\r?" +(defvoo nntp-via-shell-prompt "bash\\|[$>] *\r?$" "*Regular expression to match the shell prompt on an intermediate host. This variable is used by the `nntp-open-via-telnet-and-telnet' method.") @@ -1764,7 +1764,7 @@ If SEND-IF-FORCE, only send authinfo to the server if the (defvoo nntp-open-telnet-envuser nil "*If non-nil, telnet session (client and server both) will support the ENVIRON option and not prompt for login name.") -(defvoo nntp-telnet-shell-prompt "bash\\|\$ *\r?$\\|> *\r?" +(defvoo nntp-telnet-shell-prompt "bash\\|[$>] *\r?$" "*Regular expression to match the shell prompt on the remote machine.") (defvoo nntp-rlogin-program "rsh" diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 783ff36172..58b1741572 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -222,9 +222,9 @@ When SET is not nil, set it for VAL (use t for an empty list)." (defmethod registry-search ((db registry-db) &rest spec) "Search for SPEC across the registry-db THIS. -For example calling with :member \\='(a 1 2) will match entry \\='((a 3 1)). -Calling with :all t (any non-nil value) will match all. -Calling with :regex \\='\(a \"h.llo\") will match entry \\='((a \"hullo\" \"bye\"). +For example calling with `:member \\='(a 1 2)' will match entry \((a 3 1)). +Calling with `:all t' (any non-nil value) will match all. +Calling with `:regex \\='(a \"h.llo\")' will match entry \(a \"hullo\" \"bye\"). The test order is to check :all first, then :member, then :regex." (when db (let ((all (plist-get spec :all)) diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el index de680795a1..5871b08b35 100644 --- a/lisp/gnus/spam-report.el +++ b/lisp/gnus/spam-report.el @@ -43,7 +43,7 @@ If you are using spam.el, consider setting gnus-spam-process-newsgroups or the gnus-group-spam-exit-processor-report-gmane group/topic parameter instead." :type '(radio (const nil) - (regexp :value "^nntp\+.*:gmane\.")) + (regexp :value "^nntp\\+.*:gmane\\.")) :group 'spam-report) (defcustom spam-report-gmane-use-article-number t diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 013fc5ae39..c5efb33815 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -1910,7 +1910,7 @@ overwritten. This confirmation can be turned off using (message "No image at point") (let ((file (image-dired-original-file-name)) command) - (if (not (string-match "\.[jJ][pP[eE]?[gG]$" file)) + (if (not (string-match "\\.[jJ][pP[eE]?[gG]$" file)) (error "Only JPEG images can be rotated!")) (setq command (format-spec image-dired-cmd-rotate-original-options @@ -1950,7 +1950,7 @@ for traceability. The format of the returned file name is YYYY_MM_DD_HH_MM_DD_ORIG_FILE_NAME.jpg. Used from `image-dired-copy-with-exif-file-name'." (let (data no-exif-data-found) - (if (not (string-match "\.[Jj][Pp][Ee]?[Gg]$" (expand-file-name file))) + (if (not (string-match "\\.[Jj][Pp][Ee]?[Gg]$" (expand-file-name file))) (progn (setq no-exif-data-found t) (setq data @@ -2572,7 +2572,7 @@ tags to their respective image file. Internal function used by ;; (let ((fattribs (file-attributes f))) ;; ;; Get last access time and file size ;; `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f))) -;; (directory-files (image-dired-dir) t ".+\.thumb\..+$")) +;; (directory-files (image-dired-dir) t ".+\\.thumb\\..+$")) ;; ;; Sort function. Compare time between two files. ;; (lambda (l1 l2) ;; (time-less-p (car l1) (car l2))))) diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el index d598814a63..29036ff796 100644 --- a/lisp/international/latin1-disp.el +++ b/lisp/international/latin1-disp.el @@ -2271,7 +2271,7 @@ isn't changed if the display can render Unicode characters." (?\∨ "OR") (?\∩ "(U") (?\∪ ")U") - (?\∫ "\int ") + (?\∫ "\\int ") (?\∬ "DI") (?\∮ "Io") (?\∴ ".:") diff --git a/lisp/leim/quail/cyrillic.el b/lisp/leim/quail/cyrillic.el index 7c443857d4..5d11e45b3f 100644 --- a/lisp/leim/quail/cyrillic.el +++ b/lisp/leim/quail/cyrillic.el @@ -1245,7 +1245,7 @@ This phonetic layout replaces all the Latin letters with Bulgarian \(Cyrillic) letters based on similarities in their pronunciation or look. Note that, since the letters `щ', `ь', `ю' and `я' are attached to the -`]', `\', `\\=`' and `[' keys respectively, Caps Lock does not affect them." +`]', `\\', `\\=`' and `[' keys respectively, Caps Lock does not affect them." nil t t t t nil nil nil nil nil t) ;; Ю 1! 2@ 3№ 4$ 5% 6€ 7§ 8* 9( 0) -– =+ ьѝ diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el index 6dd2606228..9fbbd94b08 100644 --- a/lisp/mail/undigest.el +++ b/lisp/mail/undigest.el @@ -79,7 +79,7 @@ See rmail-digest-methods." (rmail-digest-rfc1153 "^-\\{70\\}\n\n" "^\n-\\{30\\}\n\n" - "^\n-\\{30\\}\n\nEnd of .* Digest.*\n\\*\\{15,\\}\n+\'")) + "^\n-\\{30\\}\n\nEnd of .* Digest.*\n\\*\\{15,\\}\n+\\'")) (defun rmail-digest-parse-rfc1153sloppy () "Parse using the method defined in RFC 1153, allowing for some sloppiness. diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el index 62e9b4a357..de2b2cf7fd 100644 --- a/lisp/mh-e/mh-letter.el +++ b/lisp/mh-e/mh-letter.el @@ -932,7 +932,7 @@ Any match found replaces the text from BEGIN to END." (and (stringp file) (file-exists-p file) (or (and (not (mh-have-file-command)) - (not (null (string-match "\.vcf$" file)))) + (not (null (string-match "\\.vcf$" file)))) (string-equal "text/x-vcard" (mh-file-mime-type file)))))) ;;;###mh-autoload diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 60b796b1fd..b69f956d5c 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1756,21 +1756,21 @@ Returns nil if file command not on system." (kill-buffer tmp-buffer))))))) (defvar mh-file-mime-type-substitutions - '(("application/msword" "\.xls" "application/ms-excel") - ("application/msword" "\.ppt" "application/ms-powerpoint") - ("text/plain" "\.vcf" "text/x-vcard") - ("text/rtf" "\.rtf" "application/rtf") - ("application/x-zip" "\.sxc" "application/vnd.sun.xml.calc") - ("application/x-zip" "\.sxd" "application/vnd.sun.xml.draw") - ("application/x-zip" "\.sxi" "application/vnd.sun.xml.impress") - ("application/x-zip" "\.sxw" "application/vnd.sun.xml.writer") - ("application/x-zip" "\.odg" "application/vnd.oasis.opendocument.graphics") - ("application/x-zip" "\.odi" "application/vnd.oasis.opendocument.image") - ("application/x-zip" "\.odp" + '(("application/msword" "\\.xls" "application/ms-excel") + ("application/msword" "\\.ppt" "application/ms-powerpoint") + ("text/plain" "\\.vcf" "text/x-vcard") + ("text/rtf" "\\.rtf" "application/rtf") + ("application/x-zip" "\\.sxc" "application/vnd.sun.xml.calc") + ("application/x-zip" "\\.sxd" "application/vnd.sun.xml.draw") + ("application/x-zip" "\\.sxi" "application/vnd.sun.xml.impress") + ("application/x-zip" "\\.sxw" "application/vnd.sun.xml.writer") + ("application/x-zip" "\\.odg" "application/vnd.oasis.opendocument.graphics") + ("application/x-zip" "\\.odi" "application/vnd.oasis.opendocument.image") + ("application/x-zip" "\\.odp" "application/vnd.oasis.opendocument.presentation") - ("application/x-zip" "\.ods" + ("application/x-zip" "\\.ods" "application/vnd.oasis.opendocument.spreadsheet") - ("application/x-zip" "\.odt" "application/vnd.oasis.opendocument.text")) + ("application/x-zip" "\\.odt" "application/vnd.oasis.opendocument.text")) "Substitutions to make for Content-Type returned from file command. The first element is the Content-Type returned by the file command. The second element is a regexp matching the file name, usually the diff --git a/lisp/net/shr-color.el b/lisp/net/shr-color.el index 433254db92..482f829707 100644 --- a/lisp/net/shr-color.el +++ b/lisp/net/shr-color.el @@ -242,7 +242,7 @@ Like rgb() or hsl()." "rgb(\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*)" color) (string-match - "rgba(\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*[0-9]*\.?[0-9]+\s*%?\s*)" + "rgba(\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*[0-9]*\\.?[0-9]+\s*%?\s*)" color)) (format "#%02X%02X%02X" (shr-color-relative-to-absolute (match-string-no-properties 1 color)) @@ -253,7 +253,7 @@ Like rgb() or hsl()." "hsl(\s*\\([0-9]\\{1,3\\}\\)\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*)" color) (string-match - "hsla(\s*\\([0-9]\\{1,3\\}\\)\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*[0-9]*\.?[0-9]+\s*%?\s*)" + "hsla(\s*\\([0-9]\\{1,3\\}\\)\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*[0-9]*\\.?[0-9]+\s*%?\s*)" color)) (let ((h (/ (string-to-number (match-string-no-properties 1 color)) 360.0)) (s (/ (string-to-number (match-string-no-properties 2 color)) 100.0)) diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el index 06adc078c5..7227803e6b 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el @@ -195,7 +195,7 @@ (:howpublished . "How something strange has been published. The first word should be capitalized.") (:institution . "The sponsoring institution of a technical report.") (:journal . "A journal name.") - (:key . "Used for alphabetizing, cross-referencing, and creating a label when the author information is missing. This field should not be confused with the key that appears in the \cite command and at the beginning of the database entry.") + (:key . "Used for alphabetizing, cross-referencing, and creating a label when the author information is missing. This field should not be confused with the key that appears in the \\cite command and at the beginning of the database entry.") (:month . "The month in which the work was published or, for an unpublished work, in which it was written. You should use the standard three-letter abbreviation,") (:note . "Any additional information that can help the reader. The first word should be capitalized.") (:number . "Any additional information that can help the reader. The first word should be capitalized.") diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el index 07224d38bd..5c0e3e9232 100644 --- a/lisp/org/org-docview.el +++ b/lisp/org/org-docview.el @@ -61,7 +61,7 @@ (setq path (org-link-escape (expand-file-name path))) (cond ((eq format 'html) (format "<a href=\"%s\">%s</a>" path desc)) - ((eq format 'latex) (format "\href{%s}{%s}" path desc)) + ((eq format 'latex) (format "\\href{%s}{%s}" path desc)) ((eq format 'ascii) (format "%s (%s)" desc path)) (t path))))) diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el index f8f218f6f5..89d6b95158 100644 --- a/lisp/org/org-entities.el +++ b/lisp/org/org-entities.el @@ -359,8 +359,8 @@ packages to be loaded, add these packages to `org-latex-packages-alist'." ("lessgtr" "\\lessgtr" t "≶" "[less than or greater than]" "[less than or greater than]" "≶") ("lesseqgtr" "\\lesseqgtr" t "⋚" "[less than or equal or greater than or equal]" "[less than or equal or greater than or equal]" "⋚") ("ll" "\\ll" t "≪" "<<" "<<" "≪") - ("Ll" "\lll" t "⋘" "<<<" "<<<" "⋘") - ("lll" "\lll" t "⋘" "<<<" "<<<" "⋘") + ("Ll" "\\lll" t "⋘" "<<<" "<<<" "⋘") + ("lll" "\\lll" t "⋘" "<<<" "<<<" "⋘") ("gg" "\\gg" t "≫" ">>" ">>" "≫") ("Gg" "\\ggg" t "⋙" ">>>" ">>>" "⋙") ("ggg" "\\ggg" t "⋙" ">>>" ">>>" "⋙") diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el index a77eaedb9a..3da52243d3 100644 --- a/lisp/org/ox-icalendar.el +++ b/lisp/org/ox-icalendar.el @@ -447,7 +447,7 @@ or subject for the event." ;; characters with literal \n. (replace-regexp-in-string "[ \t]*\n" "\\n" - (replace-regexp-in-string "[\\,;]" "\\\&" s) + (replace-regexp-in-string "[\\,;]" "\\\\\\&" s) nil t))) (defun org-icalendar-fold-string (s) diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 4e3e0ef937..3493b837ce 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -777,7 +777,7 @@ is nil. You can also allow them through local buffer variables." This variable allows to provide shortcuts for export snippets. -For example, with a value of '\(\(\"h\" . \"html\"\)\), the +For example, with a value of \((\"h\" . \"html\")), the HTML back-end will recognize the contents of \"@@h:<b>@@\" as HTML code while every other back-end will ignore it." :group 'org-export-general diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 5da6508471..528bc44f8a 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -5043,7 +5043,7 @@ conditional/loop constructs." (goto-char top)) (if (looking-at ; Try Plan C: continuation block (concat cperl-maybe-white-and-comment-rex - "\\<\\(else\\|elsif\|continue\\)\\>")) + "\\<\\(else\\|elsif\\|continue\\)\\>")) (progn (goto-char (match-end 0)) (setq tmp-end (point-at-eol))) diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index c694bbd583..6d8e90c2d6 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -1899,7 +1899,7 @@ It's only used when `ebnf-syntax' is `iso-ebnf'." :group 'ebnf-syntactic) -(defcustom ebnf-file-suffix-regexp "\.[Bb][Nn][Ff]$" +(defcustom ebnf-file-suffix-regexp "\\.[Bb][Nn][Ff]$" "Specify file name suffix that contains EBNF. See `ebnf-eps-directory' command." @@ -2731,7 +2731,7 @@ See also `ebnf-syntax-buffer'." (ebnf-syntax . 'ebnf) (ebnf-iso-alternative-p . nil) (ebnf-iso-normalize-p . nil) - (ebnf-file-suffix-regexp . "\.[Bb][Nn][Ff]$") + (ebnf-file-suffix-regexp . "\\.[Bb][Nn][Ff]$") (ebnf-eps-prefix . "ebnf--") (ebnf-eps-header-font . '(11 Helvetica "Black" "White" bold)) (ebnf-eps-header . nil) diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index c4111398f5..4473409e34 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -434,7 +434,7 @@ It collects and prints the diagnostics messages." ;; A system variable -- only system help ((string-match - "\\`!\\([a-zA-Z0-9_]+\\)\\(\.\\([A-Za-z0-9_]+\\)\\)?" + "\\`!\\([a-zA-Z0-9_]+\\)\\(\\.\\([A-Za-z0-9_]+\\)\\)?" this-word) (let* ((word (match-string-no-properties 1 this-word)) (entry (assq (idlwave-sintern-sysvar word) @@ -1312,7 +1312,7 @@ IDL assistant.") (let ((help-loc (idlwave-html-help-location)) topic anchor file just-started exists full-link) - (if (string-match "\.html" link) + (if (string-match "\\.html" link) (setq topic (substring link 0 (match-beginning 0)) anchor (substring link (match-end 0))) (error "Malformed help link")) diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 4f46cbe635..9736f0f207 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -1502,7 +1502,7 @@ Insertion takes place at point." (if (zerop (+ (length targets) (length macros))) (progn (beep) - (message "No macros or targets to browse! Consider running 'makefile-pickup-everything\'")) + (message "No macros or targets to browse! Consider running `makefile-pickup-everything'")) (let ((browser-buffer (get-buffer-create makefile-browser-buffer-name))) (pop-to-buffer browser-buffer) (makefile-browser-fill targets macros) diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 5d59a56e85..026616e68f 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -709,7 +709,7 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'." (if prefix (setq name (cond - ((string-match "^self\." name) + ((string-match "^self\\." name) (concat (substring prefix 0 -1) (substring name 4))) (t (concat prefix name))))) (push (cons name pos) index-alist) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index cbf65c0a80..3b77ac088e 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -360,7 +360,7 @@ file. Since that is a plaintext file, this could be dangerous." :sqli-comint-func sql-comint-db2 :prompt-regexp "^db2 => " :prompt-length 7 - :prompt-cont-regexp "^db2 (cont\.) => " + :prompt-cont-regexp "^db2 (cont\\.) => " :input-filter sql-escape-newlines-filter) (informix @@ -491,7 +491,7 @@ file. Since that is a plaintext file, this could be dangerous." :completion-object sql-sqlite-completion-object :prompt-regexp "^sqlite> " :prompt-length 8 - :prompt-cont-regexp "^ \.\.\.> " + :prompt-cont-regexp "^ \\.\\.\\.> " :terminator ";") (sybase diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 5fcdba6fb2..ac9bdd8b25 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -841,7 +841,7 @@ first difference.") (verilog-xl-2 "([WE][0-9A-Z]+)[ \t]+\\([^ \t\n,]+\\)[, \t]+\\(line[ \t]+\\)?\\([0-9]+\\):.*$" 1 3) (verilog-IES - ".*\\*[WE],[0-9A-Z]+\\(\[[0-9A-Z_,]+\]\\)? (\\([^ \t,]+\\),\\([0-9]+\\)" 2 3) + ".*\\*[WE],[0-9A-Z]+\\(\\[[0-9A-Z_,]+]\\)? (\\([^ \t,]+\\),\\([0-9]+\\)" 2 3) (verilog-surefire-1 "[^\n]*\\[\\([^:]+\\):\\([0-9]+\\)\\]" 1 2) (verilog-surefire-2 @@ -885,8 +885,8 @@ See `compilation-error-regexp-alist-alist' for the formatting. For XEmacs.") ("([WE][0-9A-Z]+)[ \t]+\\([^ \t\n,]+\\)[, \t]+\\(line[ \t]+\\)?\\([0-9]+\\):.*$" 1 bold t) ("([WE][0-9A-Z]+)[ \t]+\\([^ \t\n,]+\\)[, \t]+\\(line[ \t]+\\)?\\([0-9]+\\):.*$" 3 bold t) ;; verilog-IES (nc-verilog) - (".*\\*[WE],[0-9A-Z]+\\(\[[0-9A-Z_,]+\]\\)? (\\([^ \t,]+\\),\\([0-9]+\\)|" 2 bold t) - (".*\\*[WE],[0-9A-Z]+\\(\[[0-9A-Z_,]+\]\\)? (\\([^ \t,]+\\),\\([0-9]+\\)|" 3 bold t) + (".*\\*[WE],[0-9A-Z]+\\(\\[[0-9A-Z_,]+]\\)? (\\([^ \t,]+\\),\\([0-9]+\\)|" 2 bold t) + (".*\\*[WE],[0-9A-Z]+\\(\\[[0-9A-Z_,]+]\\)? (\\([^ \t,]+\\),\\([0-9]+\\)|" 3 bold t) ;; verilog-surefire-1 ("[^\n]*\\[\\([^:]+\\):\\([0-9]+\\)\\]" 1 bold t) ("[^\n]*\\[\\([^:]+\\):\\([0-9]+\\)\\]" 2 bold t) @@ -2303,7 +2303,7 @@ find the errors." ;; non blocking assignment operator "<=" ;; comparison - "==" "!=" "===" "!==" "<=" ">=" "==\?" "!=\?" "<->" + "==" "!=" "===" "!==" "<=" ">=" "==\\?" "!=\\?" "<->" ;; event_trigger "->" "->>" ;; property_expr @@ -9674,7 +9674,7 @@ If undefined, and WING-IT, return just SYMBOL without the tick, else nil." ;; something like a[b]. Sorry, it should be substituted into the parser (setq symbol (verilog-string-replace-matches - "\[[^0-9: \t]+\]" "" nil nil + "\\[[^0-9: \t]+]" "" nil nil (or (verilog-symbol-detick symbol nil) (if verilog-auto-sense-defines-constant "0" diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 19a7e970a6..6f486cf758 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -268,7 +268,7 @@ Overrides local variable `indent-tabs-mode'." ;; ** Error: adder.vhd(190): Unknown identifier: ctl_numb ("ModelSim" "vcom" "-93 -work \\1" "make" "-f \\1" nil "vlib \\1; vmap \\2 \\1" "./" "work/" "Makefile" "modelsim" - ("^\\(ERROR\\|WARNING\\|\\*\\* Error\\|\\*\\* Warning\\)[^:]*:\\( *\[[0-9]+\]\\)? \\([^ \t\n]+\\)(\\([0-9]+\\)):" 3 4 nil) ("" 0) + ("^\\(ERROR\\|WARNING\\|\\*\\* Error\\|\\*\\* Warning\\)[^:]*:\\( *\\[[0-9]+]\\)? \\([^ \t\n]+\\)(\\([0-9]+\\)):" 3 4 nil) ("" 0) ("\\1/_primary.dat" "\\2/\\1.dat" "\\1/_primary.dat" "\\1/_primary.dat" "\\1/body.dat" downcase)) ;; ProVHDL, Synopsys LEDA: provhdl -w work -f test.vhd @@ -315,7 +315,7 @@ Overrides local variable `indent-tabs-mode'." ;; ERROR[11]::File test.vhd Line 100: Use of undeclared identifier ("Speedwave" "analyze" "-libfile vsslib.ini -src" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "speedwave" - ("^ *ERROR\[[0-9]+\]::File \\([^ \t\n]+\\) Line \\([0-9]+\\):" 1 2 nil) ("" 0) + ("^ *ERROR\\[[0-9]+]::File \\([^ \t\n]+\\) Line \\([0-9]+\\):" 1 2 nil) ("" 0) nil) ;; Synopsys, VHDL Analyzer (sim): vhdlan -nc test.vhd ;; **Error: vhdlan,703 test.vhd(22): OTHERS is not legal in this context. @@ -364,7 +364,7 @@ Overrides local variable `indent-tabs-mode'." ;; ERROR:HDLParsers:164 - "test.vhd" Line 3. parse error ("Xilinx XST" "xflow" "" "make" "-f \\1" nil "mkdir \\1" "./" "work/" "Makefile" "xilinx" - ("^ERROR:HDLParsers:[0-9]+ - \"\\([^ \t\n]+\\)\" Line \\([0-9]+\\)\." 1 2 nil) ("" 0) + ("^ERROR:HDLParsers:[0-9]+ - \"\\([^ \t\n]+\\)\" Line \\([0-9]+\\)\\." 1 2 nil) ("" 0) nil) ) "List of available VHDL compilers and their properties. @@ -1678,8 +1678,8 @@ syntax (as regular expression) are highlighted in the corresponding color. Name : string of words and spaces Regexp : regular expression describing word syntax - (e.g. \"\\\\=\<\\\w+_c\\\\=\>\" matches word with suffix \"_c\") - expression must start with \"\\\\=\<\" and end with \"\\\\=\>\" + (e.g., `\\=\\<\\w+_c\\>' matches word with suffix `_c') + expression must start with `\\=\\<' and end with `\\>' if only whole words should be matched (no substrings) Color (light): foreground color for light background (matching color examples: Gold3, Grey50, LimeGreen, Tomato, @@ -1690,14 +1690,14 @@ syntax (as regular expression) are highlighted in the corresponding color. In comments : If non-nil, words are also highlighted inside comments Can be used for visual support of naming conventions, such as highlighting -different kinds of signals (e.g. \"Clk50\", \"Rst_n\") or objects (e.g. -\"Signal_s\", \"Variable_v\", \"Constant_c\") by distinguishing them using +different kinds of signals (e.g. `Clk50', `Rst_n') or objects (e.g. +`Signal_s', `Variable_v', `Constant_c') by distinguishing them using common substrings or name suffices. For each entry, a new face is generated with the specified colors and name -\"vhdl-font-lock-\" + name + \"-face\". +`vhdl-font-lock-' + name + `-face'. NOTE: Activate a changed regexp in a VHDL buffer by re-fontifying it (menu - entry \"Fontify Buffer\"). All other changes require restarting Emacs." + entry `Fontify Buffer'). All other changes require restarting Emacs." :type '(repeat (list :tag "Face" :indent 2 (string :tag "Name ") (regexp :tag "Regexp " "\\w+_") diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 7f186afc27..f57113177c 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -244,7 +244,7 @@ of master file." (when (or (null reftex-label-ignored-macros-and-environments) ;; \label{} defs should always be honored, ;; just no keyval style [label=foo] defs. - (string-equal "\label{" (substring (reftex-match-string 0) 0 7)) + (string-equal "\\label{" (substring (reftex-match-string 0) 0 7)) (if (and (fboundp 'TeX-current-macro) (fboundp 'LaTeX-current-environment)) (not (or (member (save-match-data (TeX-current-macro)) diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 41d805686a..51cda80c5b 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1550,7 +1550,7 @@ Puts point on a blank line between them." "\\end{" str "}" > \n) (define-skeleton latex-insert-item - "Insert a \item macro." + "Insert an \\item macro." nil \n "\\item " >) diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index d120d05221..9ab8d75fbb 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -158,7 +158,7 @@ use the file's name relative to the directory of the change log file." :group 'change-log) (defcustom change-log-version-number-regexp-list - (let ((re "\\([0-9]+\.[0-9.]+\\)")) + (let ((re "\\([0-9]+\\.[0-9.]+\\)")) (list ;; (defconst ad-version "2.15" (concat "^(def[^ \t\n]+[ \t]+[^ \t\n][ \t]\"" re) diff --git a/lisp/woman.el b/lisp/woman.el index f2e59e50bc..b4f4669de9 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2716,7 +2716,7 @@ If DELETE is non-nil then delete from point." (defsubst woman-unescape (macro) "Replace escape sequences in the body of MACRO. -Replaces || by |, but | by \, where | denotes the internal escape." +Replaces || by |, but | by \\, where | denotes the internal escape." (let (start) (while (setq start (string-match woman-unescape-regex macro start)) (setq macro @@ -2838,7 +2838,7 @@ special characters." (defun woman-strings (&optional to) "Process ?roff string requests and escape sequences up to buffer position TO. Strings are defined/updated by `.ds xx string' requests and -interpolated by `\*x' and `\*(xx' escapes." +interpolated by `\\*x' and `\\*(xx' escapes." ;; Add support for .as and .rm? (while ;; Find .ds requests and \* escapes: |