[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3c4c8ca: Fix all unescaped character literals
|
From: |
Philipp Stephani |
|
Subject: |
[Emacs-diffs] master 3c4c8ca: Fix all unescaped character literals |
|
Date: |
Sun, 7 May 2017 07:36:59 -0400 (EDT) |
branch: master
commit 3c4c8ca06e3306ccbcd07e354eb51abe53b52d22
Author: Philipp Stephani <address@hidden>
Commit: Philipp <address@hidden>
Fix all unescaped character literals
---
lisp/calendar/timeclock.el | 4 ++--
lisp/emulation/viper-cmd.el | 2 +-
lisp/language/japan-util.el | 2 +-
lisp/leim/quail/cyrillic.el | 8 ++++----
lisp/mh-e/mh-search.el | 4 ++--
lisp/nxml/xsd-regexp.el | 2 +-
lisp/obsolete/complete.el | 2 +-
lisp/obsolete/vi.el | 4 ++--
lisp/org/ob-ref.el | 2 +-
lisp/progmodes/ada-mode.el | 2 +-
lisp/progmodes/cperl-mode.el | 4 ++--
lisp/progmodes/gud.el | 8 ++++----
lisp/progmodes/idlw-shell.el | 4 ++--
lisp/progmodes/sh-script.el | 4 ++--
lisp/progmodes/tcl.el | 2 +-
lisp/progmodes/verilog-mode.el | 8 ++++----
lisp/skeleton.el | 4 ++--
lisp/woman.el | 2 +-
18 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index f8de084..a4709c3 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -656,9 +656,9 @@ that variable's documentation."
(setq timeclock-mode-string
(propertize
(format " %c%s%c "
- (if last-in ?< ?[)
+ (if last-in ?< ?\[)
(timeclock-seconds-to-string remainder nil t)
- (if last-in ?> ?]))
+ (if last-in ?> ?\]))
'help-echo "timeclock: time remaining"))))
(put 'timeclock-mode-string 'risky-local-variable t)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 831b9c1..a697aa7 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -90,7 +90,7 @@
(defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?j ?k ?l
?H ?M ?L ?n ?t ?T ?w ?W ?$ ?%
- ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?`
+ ?^ ?\( ?\) ?- ?+ ?| ?{ ?} ?\[ ?\] ?' ?`
?\; ?, ?0 ?? ?/ ?\ ?\C-m
space return
delete backspace
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index abc8d7d..01cdd8b 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -102,7 +102,7 @@ HANKAKU-KATAKANA belongs to `japanese-jisx0201-kana'.")
(?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B
nil ?(I^(B) (?$B!,(B nil ?(I_(B)
(?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?-
?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-)
(?$B!?(B ?/) (address@hidden(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|)
(?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\")
- (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?[) (?\$B!O(B ?])
(?\$B!P(B ?{) (?\$B!Q(B ?})
+ (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?\[) (?\$B!O(B ?\])
(?\$B!P(B ?{) (?\$B!Q(B ?})
(?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil
?\(I#(B)
(?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>)
(?$B!l(B ?') (?$B!m(B ?\") (?$B!o(B ?\\) (?$B!p(B ?$) (?$B!s(B
?%) (?$B!t(B ?#) (?$B!u(B ?&) (?$B!v(B ?*)
diff --git a/lisp/leim/quail/cyrillic.el b/lisp/leim/quail/cyrillic.el
index af9f66c..600193d 100644
--- a/lisp/leim/quail/cyrillic.el
+++ b/lisp/leim/quail/cyrillic.el
@@ -235,8 +235,8 @@
("^" ?:)
("&" ??)
("*" ?*)
- ("(" ?()
- (")" ?))
+ ("(" ?\()
+ (")" ?\))
("_" ?_)
("+" ?+)
("~" ?Ё)
@@ -789,8 +789,8 @@ Sorry, but `ghe with upturn' is not included in ISO 8859-5."
("^" ?:)
("&" ??)
("*" ?*)
- ("(" ?()
- (")" ?))
+ ("(" ?\()
+ (")" ?\))
("_" ?_)
("+" ?+)
("~" ?')
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 7ff3564..b0fdfce 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1517,8 +1517,8 @@ construct the base name."
(setq string (mh-replace-string "-lbrace" " "))
(setq string (mh-replace-string "-rbrace" " "))
(setq string (mh-replace-string "-search" " "))
- (subst-char-in-region (point-min) (point-max) ?( ? t)
- (subst-char-in-region (point-min) (point-max) ?) ? t)
+ (subst-char-in-region (point-min) (point-max) ?\( ? t)
+ (subst-char-in-region (point-min) (point-max) ?\) ? t)
(subst-char-in-region (point-min) (point-max) ?- ? t)
(goto-char (point-min))
(while (and (not (eobp)) (memq (char-after) '(? ?\t ?\n ?\r ?_)))
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index 6acb1ff..d56960c 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -621,7 +621,7 @@ whose value is a range-list."
(defun xsdre-parse-escape ()
(let ((ch (car xsdre-current-regexp)))
(xsdre-advance)
- (cond ((memq ch '(?\\ ?| ?. ?- ?^ ?* ?+ ?( ?) ?{ ?} ?[ ?])) ch)
+ (cond ((memq ch '(?\\ ?| ?. ?- ?^ ?* ?+ ?\( ?\) ?{ ?} ?\[ ?\])) ch)
((eq ch ?r) ?\r)
((eq ch ?n) ?\n)
((eq ch ?t) ?\t)
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index a6c21bc..6a7fdc5 100644
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -570,7 +570,7 @@ GOTO-END is non-nil, however, it instead replaces up to
END."
(substring regex (1+ p)))
p (+ p (length PC-ndelims-regex) (length PC-delim-regex)))
(let ((bump (if (memq (aref regex p)
- '(?$ ?^ ?\. ?* ?+ ?? ?[ ?] ?\\))
+ '(?$ ?^ ?\. ?* ?+ ?? ?\[ ?\] ?\\))
-1 0)))
(setq regex (concat (substring regex 0 (+ p bump))
PC-ndelims-regex
diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el
index 5b611aa..a7a98d0 100644
--- a/lisp/obsolete/vi.el
+++ b/lisp/obsolete/vi.el
@@ -1444,10 +1444,10 @@ Currently, CHAR could be [,{,(,\",',`,<,*, etc."
(vi-set-last-change-command 'vi-quote-words arg char)
(if (not (looking-at "\\<")) (forward-word -1))
(insert char)
- (cond ((char-equal char ?[) (setq char ?]))
+ (cond ((char-equal char ?\[) (setq char ?\]))
((char-equal char ?{) (setq char ?}))
((char-equal char ?<) (setq char ?>))
- ((char-equal char ?() (setq char ?)))
+ ((char-equal char ?\() (setq char ?\)))
((char-equal char ?`) (setq char ?')))
(vi-end-of-word arg)
(forward-char 1)
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 58cc2d9..1d26403 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -133,7 +133,7 @@ the variable."
;; if ref is indexed grab the indices -- beware nested indices
(when (and (string-match "\\[\\([^\\[]+\\)\\]$" ref)
(let ((str (substring ref 0 (match-beginning 0))))
- (= (org-count ?( str) (org-count ?) str))))
+ (= (org-count ?\( str) (org-count ?\) str))))
(setq index (match-string 1 ref))
(setq ref (substring ref 0 (match-beginning 0))))
;; assign any arguments to pass to source block
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 10cca6a..ab3ff3a 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1664,7 +1664,7 @@ ARG is the prefix the user entered with
\\[universal-argument]."
ada-mode-map
(char-to-string key)
'ada-adjust-case-interactive)))
- '( ?` ?_ ?# ?% ?& ?* ?( ?) ?- ?= ?+
+ '( ?` ?_ ?# ?% ?& ?* ?\( ?\) ?- ?= ?+
?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r )))
(defun ada-loose-case-word (&optional _arg)
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 23ea91f..c0f1aaf 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -2173,8 +2173,8 @@ See `cperl-electric-parens'."
(insert (make-string
(prefix-numeric-value arg)
(cdr (assoc last-command-event '((?{ .?})
- (?[ . ?])
- (?( . ?))
+ (?\[ . ?\])
+ (?\( . ?\))
(?< . ?>))))))
(forward-char (- (prefix-numeric-value arg))))
(self-insert-command (prefix-numeric-value arg)))))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 7ab1442..8cb9127 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3118,10 +3118,10 @@ Link exprs of the form:
(setq span-start (char-after (- span-start 1)))
(setq span-end (char-after span-end))
(cond
- ((= span-start ?)) t)
- ((= span-start ?]) t)
- ((= span-end ?() t)
- ((= span-end ?[) t)
+ ((= span-start ?\)) t)
+ ((= span-start ?\]) t)
+ ((= span-end ?\() t)
+ ((= span-end ?\[) t)
(t nil)))
(t nil))))
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 1282f08..e7497e8 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -4172,8 +4172,8 @@ Otherwise, just expand the file name."
([(control ?t)] ?t idlwave-shell-toggle-toolbar)
([(control up)] up idlwave-shell-stack-up)
([(control down)] down idlwave-shell-stack-down)
- ([( ?[)] ?[ idlwave-shell-goto-previous-bp t t)
- ([( ?])] ?] idlwave-shell-goto-next-bp t t)
+ ([( ?\[)] ?\[ idlwave-shell-goto-previous-bp t t)
+ ([( ?\])] ?\] idlwave-shell-goto-next-bp t t)
([(control ?f)] ?f idlwave-shell-window)))
(mod (and (listp idlwave-shell-debug-modifiers)
idlwave-shell-debug-modifiers))
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index a0bbf55..db965c5 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -599,8 +599,8 @@ This is buffer-local in every such buffer.")
map)
"Keymap used in Shell-Script mode.")
-(defvar sh-skeleton-pair-default-alist '((?( _ ?)) (?\))
- (?[ ?\s _ ?\s ?]) (?\])
+(defvar sh-skeleton-pair-default-alist '((?\( _ ?\)) (?\))
+ (?\[ ?\s _ ?\s ?\]) (?\])
(?{ _ ?}) (?\}))
"Value to use for `skeleton-pair-default-alist' in Shell-Script mode.")
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index 2c7ce03..902a5aa 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -1524,7 +1524,7 @@ The first line is assumed to look like \"#!.../program
...\"."
(defun tcl-quote (string)
"Quote STRING according to Tcl rules."
(mapconcat (lambda (char)
- (if (memq char '(?[ ?] ?{ ?} ?\\ ?\" ?$ ?\s ?\;))
+ (if (memq char '(?\[ ?\] ?{ ?} ?\\ ?\" ?$ ?\s ?\;))
(concat "\\" (char-to-string char))
(char-to-string char)))
string ""))
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 9f3bad1..4860ea2 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -14003,7 +14003,7 @@ See also `verilog-header' for an alternative format."
(define-skeleton verilog-sk-task
"Insert a task definition."
()
- > "task " '(verilog-sk-prompt-name) & ?; \n
+ > "task " '(verilog-sk-prompt-name) & ?\; \n
> _ \n
> "begin" \n
> \n
@@ -14013,7 +14013,7 @@ See also `verilog-header' for an alternative format."
(define-skeleton verilog-sk-function
"Insert a function definition."
()
- > "function [" '(verilog-sk-prompt-width) | -1 '(verilog-sk-prompt-name) ?;
\n
+ > "function [" '(verilog-sk-prompt-width) | -1 '(verilog-sk-prompt-name) ?\;
\n
> _ \n
> "begin" \n
> \n
@@ -14208,13 +14208,13 @@ and the case items."
'(setq input "state")
> "// State registers for " str | -23 \n
'(setq verilog-sk-state str)
- > "reg [" '(verilog-sk-prompt-width) | -1 verilog-sk-state ", next_"
verilog-sk-state ?; \n
+ > "reg [" '(verilog-sk-prompt-width) | -1 verilog-sk-state ", next_"
verilog-sk-state ?\; \n
'(setq input nil)
> \n
> "// State FF for " verilog-sk-state \n
> "always @ ( " (read-string "clock:" "posedge clk") " or "
(verilog-sk-prompt-reset) " ) begin" \n
> "if ( " verilog-sk-reset " ) " verilog-sk-state " = 0; else" \n
- > verilog-sk-state " = next_" verilog-sk-state ?; \n
+ > verilog-sk-state " = next_" verilog-sk-state ?\; \n
> (- verilog-indent-level-behavioral) "end" (progn
(electric-verilog-terminate-line) nil)
> \n
> "// Next State Logic for " verilog-sk-state \n
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 92de90c..dbfa87e 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -487,8 +487,8 @@ Each alist element, which looks like (ELEMENT ...), is
passed to
Elements might be (?\\=` ?\\=` _ \"\\='\\='\"), (?\\( ? _ \" )\") or (?{ \\n
> _ \\n ?} >).")
-(defvar skeleton-pair-default-alist '((?( _ ?)) (?\))
- (?[ _ ?]) (?\])
+(defvar skeleton-pair-default-alist '((?\( _ ?\)) (?\))
+ (?\[ _ ?\]) (?\])
(?{ _ ?}) (?\})
(?< _ ?>) (?\>)
(?« _ ?») (?\»)
diff --git a/lisp/woman.el b/lisp/woman.el
index 720fe66..aa856c3 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -4420,7 +4420,7 @@ Needs doing properly!"
;; A field is contained between a pair of field delimiter
;; characters and consists of sub-strings separated by padding
;; indicator characters:
- (setq delim (string delim ?[ ?^ delim ?] ?* delim))
+ (setq delim (string delim ?\[ ?^ delim ?\] ?* delim))
(save-excursion
(while (re-search-forward delim end t)
(goto-char (match-beginning 0))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 3c4c8ca: Fix all unescaped character literals,
Philipp Stephani <=