diff options
| author | Philipp Stephani | 2017-05-06 19:16:49 +0200 |
|---|---|---|
| committer | Philipp | 2017-05-07 13:22:34 +0200 |
| commit | 3c4c8ca06e3306ccbcd07e354eb51abe53b52d22 (patch) | |
| tree | 01542b123bede1a9d6d9b05ec1dbf2089e9a76bd | |
| parent | bcbd8f7e4e929604bb3dfef9937432cb05b5f648 (diff) | |
| download | emacs-3c4c8ca06e3306ccbcd07e354eb51abe53b52d22.tar.gz emacs-3c4c8ca06e3306ccbcd07e354eb51abe53b52d22.zip | |
Fix all unescaped character literals
| -rw-r--r-- | lisp/calendar/timeclock.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 2 | ||||
| -rw-r--r-- | lisp/language/japan-util.el | 2 | ||||
| -rw-r--r-- | lisp/leim/quail/cyrillic.el | 8 | ||||
| -rw-r--r-- | lisp/mh-e/mh-search.el | 4 | ||||
| -rw-r--r-- | lisp/nxml/xsd-regexp.el | 2 | ||||
| -rw-r--r-- | lisp/obsolete/complete.el | 2 | ||||
| -rw-r--r-- | lisp/obsolete/vi.el | 4 | ||||
| -rw-r--r-- | lisp/org/ob-ref.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/ada-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 8 | ||||
| -rw-r--r-- | lisp/progmodes/idlw-shell.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/tcl.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/verilog-mode.el | 8 | ||||
| -rw-r--r-- | lisp/skeleton.el | 4 | ||||
| -rw-r--r-- | lisp/woman.el | 2 |
18 files changed, 34 insertions, 34 deletions
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index f8de084f776..a4709c3b4b5 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el | |||
| @@ -656,9 +656,9 @@ that variable's documentation." | |||
| 656 | (setq timeclock-mode-string | 656 | (setq timeclock-mode-string |
| 657 | (propertize | 657 | (propertize |
| 658 | (format " %c%s%c " | 658 | (format " %c%s%c " |
| 659 | (if last-in ?< ?[) | 659 | (if last-in ?< ?\[) |
| 660 | (timeclock-seconds-to-string remainder nil t) | 660 | (timeclock-seconds-to-string remainder nil t) |
| 661 | (if last-in ?> ?])) | 661 | (if last-in ?> ?\])) |
| 662 | 'help-echo "timeclock: time remaining")))) | 662 | 'help-echo "timeclock: time remaining")))) |
| 663 | 663 | ||
| 664 | (put 'timeclock-mode-string 'risky-local-variable t) | 664 | (put 'timeclock-mode-string 'risky-local-variable t) |
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 831b9c1ac28..a697aa7d032 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el | |||
| @@ -90,7 +90,7 @@ | |||
| 90 | 90 | ||
| 91 | (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?j ?k ?l | 91 | (defconst viper-movement-commands '(?b ?B ?e ?E ?f ?F ?G ?h ?j ?k ?l |
| 92 | ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?% | 92 | ?H ?M ?L ?n ?t ?T ?w ?W ?$ ?% |
| 93 | ?^ ?( ?) ?- ?+ ?| ?{ ?} ?[ ?] ?' ?` | 93 | ?^ ?\( ?\) ?- ?+ ?| ?{ ?} ?\[ ?\] ?' ?` |
| 94 | ?\; ?, ?0 ?? ?/ ?\ ?\C-m | 94 | ?\; ?, ?0 ?? ?/ ?\ ?\C-m |
| 95 | space return | 95 | space return |
| 96 | delete backspace | 96 | delete backspace |
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index abc8d7d6bcd..01cdd8bef9e 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el | |||
| @@ -102,7 +102,7 @@ HANKAKU-KATAKANA belongs to `japanese-jisx0201-kana'.") | |||
| 102 | (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B) | 102 | (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B) |
| 103 | (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-) | 103 | (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-) |
| 104 | (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\") | 104 | (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\") |
| 105 | (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?[) (?\$B!O(B ?]) (?\$B!P(B ?{) (?\$B!Q(B ?}) | 105 | (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?\[) (?\$B!O(B ?\]) (?\$B!P(B ?{) (?\$B!Q(B ?}) |
| 106 | (?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil ?\(I#(B) | 106 | (?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil ?\(I#(B) |
| 107 | (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>) | 107 | (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>) |
| 108 | (?$B!l(B ?') (?$B!m(B ?\") (?$B!o(B ?\\) (?$B!p(B ?$) (?$B!s(B ?%) (?$B!t(B ?#) (?$B!u(B ?&) (?$B!v(B ?*) | 108 | (?$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 af9f66c47f4..600193ddc18 100644 --- a/lisp/leim/quail/cyrillic.el +++ b/lisp/leim/quail/cyrillic.el | |||
| @@ -235,8 +235,8 @@ | |||
| 235 | ("^" ?:) | 235 | ("^" ?:) |
| 236 | ("&" ??) | 236 | ("&" ??) |
| 237 | ("*" ?*) | 237 | ("*" ?*) |
| 238 | ("(" ?() | 238 | ("(" ?\() |
| 239 | (")" ?)) | 239 | (")" ?\)) |
| 240 | ("_" ?_) | 240 | ("_" ?_) |
| 241 | ("+" ?+) | 241 | ("+" ?+) |
| 242 | ("~" ?Ё) | 242 | ("~" ?Ё) |
| @@ -789,8 +789,8 @@ Sorry, but `ghe with upturn' is not included in ISO 8859-5." | |||
| 789 | ("^" ?:) | 789 | ("^" ?:) |
| 790 | ("&" ??) | 790 | ("&" ??) |
| 791 | ("*" ?*) | 791 | ("*" ?*) |
| 792 | ("(" ?() | 792 | ("(" ?\() |
| 793 | (")" ?)) | 793 | (")" ?\)) |
| 794 | ("_" ?_) | 794 | ("_" ?_) |
| 795 | ("+" ?+) | 795 | ("+" ?+) |
| 796 | ("~" ?') | 796 | ("~" ?') |
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index 7ff35645bdd..b0fdfce8e87 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el | |||
| @@ -1517,8 +1517,8 @@ construct the base name." | |||
| 1517 | (setq string (mh-replace-string "-lbrace" " ")) | 1517 | (setq string (mh-replace-string "-lbrace" " ")) |
| 1518 | (setq string (mh-replace-string "-rbrace" " ")) | 1518 | (setq string (mh-replace-string "-rbrace" " ")) |
| 1519 | (setq string (mh-replace-string "-search" " ")) | 1519 | (setq string (mh-replace-string "-search" " ")) |
| 1520 | (subst-char-in-region (point-min) (point-max) ?( ? t) | 1520 | (subst-char-in-region (point-min) (point-max) ?\( ? t) |
| 1521 | (subst-char-in-region (point-min) (point-max) ?) ? t) | 1521 | (subst-char-in-region (point-min) (point-max) ?\) ? t) |
| 1522 | (subst-char-in-region (point-min) (point-max) ?- ? t) | 1522 | (subst-char-in-region (point-min) (point-max) ?- ? t) |
| 1523 | (goto-char (point-min)) | 1523 | (goto-char (point-min)) |
| 1524 | (while (and (not (eobp)) (memq (char-after) '(? ?\t ?\n ?\r ?_))) | 1524 | (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 6acb1ff9d41..d56960c9fa9 100644 --- a/lisp/nxml/xsd-regexp.el +++ b/lisp/nxml/xsd-regexp.el | |||
| @@ -621,7 +621,7 @@ whose value is a range-list." | |||
| 621 | (defun xsdre-parse-escape () | 621 | (defun xsdre-parse-escape () |
| 622 | (let ((ch (car xsdre-current-regexp))) | 622 | (let ((ch (car xsdre-current-regexp))) |
| 623 | (xsdre-advance) | 623 | (xsdre-advance) |
| 624 | (cond ((memq ch '(?\\ ?| ?. ?- ?^ ?* ?+ ?( ?) ?{ ?} ?[ ?])) ch) | 624 | (cond ((memq ch '(?\\ ?| ?. ?- ?^ ?* ?+ ?\( ?\) ?{ ?} ?\[ ?\])) ch) |
| 625 | ((eq ch ?r) ?\r) | 625 | ((eq ch ?r) ?\r) |
| 626 | ((eq ch ?n) ?\n) | 626 | ((eq ch ?n) ?\n) |
| 627 | ((eq ch ?t) ?\t) | 627 | ((eq ch ?t) ?\t) |
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el index a6c21bce87c..6a7fdc59c22 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." | |||
| 570 | (substring regex (1+ p))) | 570 | (substring regex (1+ p))) |
| 571 | p (+ p (length PC-ndelims-regex) (length PC-delim-regex))) | 571 | p (+ p (length PC-ndelims-regex) (length PC-delim-regex))) |
| 572 | (let ((bump (if (memq (aref regex p) | 572 | (let ((bump (if (memq (aref regex p) |
| 573 | '(?$ ?^ ?\. ?* ?+ ?? ?[ ?] ?\\)) | 573 | '(?$ ?^ ?\. ?* ?+ ?? ?\[ ?\] ?\\)) |
| 574 | -1 0))) | 574 | -1 0))) |
| 575 | (setq regex (concat (substring regex 0 (+ p bump)) | 575 | (setq regex (concat (substring regex 0 (+ p bump)) |
| 576 | PC-ndelims-regex | 576 | PC-ndelims-regex |
diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el index 5b611aa2d04..a7a98d0ca55 100644 --- a/lisp/obsolete/vi.el +++ b/lisp/obsolete/vi.el | |||
| @@ -1444,10 +1444,10 @@ Currently, CHAR could be [,{,(,\",',`,<,*, etc." | |||
| 1444 | (vi-set-last-change-command 'vi-quote-words arg char) | 1444 | (vi-set-last-change-command 'vi-quote-words arg char) |
| 1445 | (if (not (looking-at "\\<")) (forward-word -1)) | 1445 | (if (not (looking-at "\\<")) (forward-word -1)) |
| 1446 | (insert char) | 1446 | (insert char) |
| 1447 | (cond ((char-equal char ?[) (setq char ?])) | 1447 | (cond ((char-equal char ?\[) (setq char ?\])) |
| 1448 | ((char-equal char ?{) (setq char ?})) | 1448 | ((char-equal char ?{) (setq char ?})) |
| 1449 | ((char-equal char ?<) (setq char ?>)) | 1449 | ((char-equal char ?<) (setq char ?>)) |
| 1450 | ((char-equal char ?() (setq char ?))) | 1450 | ((char-equal char ?\() (setq char ?\))) |
| 1451 | ((char-equal char ?`) (setq char ?'))) | 1451 | ((char-equal char ?`) (setq char ?'))) |
| 1452 | (vi-end-of-word arg) | 1452 | (vi-end-of-word arg) |
| 1453 | (forward-char 1) | 1453 | (forward-char 1) |
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el index 58cc2d96a64..1d26403035f 100644 --- a/lisp/org/ob-ref.el +++ b/lisp/org/ob-ref.el | |||
| @@ -133,7 +133,7 @@ the variable." | |||
| 133 | ;; if ref is indexed grab the indices -- beware nested indices | 133 | ;; if ref is indexed grab the indices -- beware nested indices |
| 134 | (when (and (string-match "\\[\\([^\\[]+\\)\\]$" ref) | 134 | (when (and (string-match "\\[\\([^\\[]+\\)\\]$" ref) |
| 135 | (let ((str (substring ref 0 (match-beginning 0)))) | 135 | (let ((str (substring ref 0 (match-beginning 0)))) |
| 136 | (= (org-count ?( str) (org-count ?) str)))) | 136 | (= (org-count ?\( str) (org-count ?\) str)))) |
| 137 | (setq index (match-string 1 ref)) | 137 | (setq index (match-string 1 ref)) |
| 138 | (setq ref (substring ref 0 (match-beginning 0)))) | 138 | (setq ref (substring ref 0 (match-beginning 0)))) |
| 139 | ;; assign any arguments to pass to source block | 139 | ;; assign any arguments to pass to source block |
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 10cca6a4a0a..ab3ff3aa208 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]." | |||
| 1664 | ada-mode-map | 1664 | ada-mode-map |
| 1665 | (char-to-string key) | 1665 | (char-to-string key) |
| 1666 | 'ada-adjust-case-interactive))) | 1666 | 'ada-adjust-case-interactive))) |
| 1667 | '( ?` ?_ ?# ?% ?& ?* ?( ?) ?- ?= ?+ | 1667 | '( ?` ?_ ?# ?% ?& ?* ?\( ?\) ?- ?= ?+ |
| 1668 | ?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r ))) | 1668 | ?| ?\; ?: ?' ?\" ?< ?, ?. ?> ?/ ?\n 32 ?\r ))) |
| 1669 | 1669 | ||
| 1670 | (defun ada-loose-case-word (&optional _arg) | 1670 | (defun ada-loose-case-word (&optional _arg) |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 23ea91fe95b..c0f1aaf39d4 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -2173,8 +2173,8 @@ See `cperl-electric-parens'." | |||
| 2173 | (insert (make-string | 2173 | (insert (make-string |
| 2174 | (prefix-numeric-value arg) | 2174 | (prefix-numeric-value arg) |
| 2175 | (cdr (assoc last-command-event '((?{ .?}) | 2175 | (cdr (assoc last-command-event '((?{ .?}) |
| 2176 | (?[ . ?]) | 2176 | (?\[ . ?\]) |
| 2177 | (?( . ?)) | 2177 | (?\( . ?\)) |
| 2178 | (?< . ?>)))))) | 2178 | (?< . ?>)))))) |
| 2179 | (forward-char (- (prefix-numeric-value arg)))) | 2179 | (forward-char (- (prefix-numeric-value arg)))) |
| 2180 | (self-insert-command (prefix-numeric-value arg))))) | 2180 | (self-insert-command (prefix-numeric-value arg))))) |
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 7ab1442c648..8cb912706fd 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -3118,10 +3118,10 @@ Link exprs of the form: | |||
| 3118 | (setq span-start (char-after (- span-start 1))) | 3118 | (setq span-start (char-after (- span-start 1))) |
| 3119 | (setq span-end (char-after span-end)) | 3119 | (setq span-end (char-after span-end)) |
| 3120 | (cond | 3120 | (cond |
| 3121 | ((= span-start ?)) t) | 3121 | ((= span-start ?\)) t) |
| 3122 | ((= span-start ?]) t) | 3122 | ((= span-start ?\]) t) |
| 3123 | ((= span-end ?() t) | 3123 | ((= span-end ?\() t) |
| 3124 | ((= span-end ?[) t) | 3124 | ((= span-end ?\[) t) |
| 3125 | (t nil))) | 3125 | (t nil))) |
| 3126 | (t nil)))) | 3126 | (t nil)))) |
| 3127 | 3127 | ||
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 1282f08b073..e7497e8e4fd 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el | |||
| @@ -4172,8 +4172,8 @@ Otherwise, just expand the file name." | |||
| 4172 | ([(control ?t)] ?t idlwave-shell-toggle-toolbar) | 4172 | ([(control ?t)] ?t idlwave-shell-toggle-toolbar) |
| 4173 | ([(control up)] up idlwave-shell-stack-up) | 4173 | ([(control up)] up idlwave-shell-stack-up) |
| 4174 | ([(control down)] down idlwave-shell-stack-down) | 4174 | ([(control down)] down idlwave-shell-stack-down) |
| 4175 | ([( ?[)] ?[ idlwave-shell-goto-previous-bp t t) | 4175 | ([( ?\[)] ?\[ idlwave-shell-goto-previous-bp t t) |
| 4176 | ([( ?])] ?] idlwave-shell-goto-next-bp t t) | 4176 | ([( ?\])] ?\] idlwave-shell-goto-next-bp t t) |
| 4177 | ([(control ?f)] ?f idlwave-shell-window))) | 4177 | ([(control ?f)] ?f idlwave-shell-window))) |
| 4178 | (mod (and (listp idlwave-shell-debug-modifiers) | 4178 | (mod (and (listp idlwave-shell-debug-modifiers) |
| 4179 | idlwave-shell-debug-modifiers)) | 4179 | idlwave-shell-debug-modifiers)) |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index a0bbf55a8f4..db965c5a58c 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.") | |||
| 599 | map) | 599 | map) |
| 600 | "Keymap used in Shell-Script mode.") | 600 | "Keymap used in Shell-Script mode.") |
| 601 | 601 | ||
| 602 | (defvar sh-skeleton-pair-default-alist '((?( _ ?)) (?\)) | 602 | (defvar sh-skeleton-pair-default-alist '((?\( _ ?\)) (?\)) |
| 603 | (?[ ?\s _ ?\s ?]) (?\]) | 603 | (?\[ ?\s _ ?\s ?\]) (?\]) |
| 604 | (?{ _ ?}) (?\})) | 604 | (?{ _ ?}) (?\})) |
| 605 | "Value to use for `skeleton-pair-default-alist' in Shell-Script mode.") | 605 | "Value to use for `skeleton-pair-default-alist' in Shell-Script mode.") |
| 606 | 606 | ||
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index 2c7ce036650..902a5aace08 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el | |||
| @@ -1524,7 +1524,7 @@ The first line is assumed to look like \"#!.../program ...\"." | |||
| 1524 | (defun tcl-quote (string) | 1524 | (defun tcl-quote (string) |
| 1525 | "Quote STRING according to Tcl rules." | 1525 | "Quote STRING according to Tcl rules." |
| 1526 | (mapconcat (lambda (char) | 1526 | (mapconcat (lambda (char) |
| 1527 | (if (memq char '(?[ ?] ?{ ?} ?\\ ?\" ?$ ?\s ?\;)) | 1527 | (if (memq char '(?\[ ?\] ?{ ?} ?\\ ?\" ?$ ?\s ?\;)) |
| 1528 | (concat "\\" (char-to-string char)) | 1528 | (concat "\\" (char-to-string char)) |
| 1529 | (char-to-string char))) | 1529 | (char-to-string char))) |
| 1530 | string "")) | 1530 | string "")) |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 9f3bad1c1a2..4860ea25998 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." | |||
| 14003 | (define-skeleton verilog-sk-task | 14003 | (define-skeleton verilog-sk-task |
| 14004 | "Insert a task definition." | 14004 | "Insert a task definition." |
| 14005 | () | 14005 | () |
| 14006 | > "task " '(verilog-sk-prompt-name) & ?; \n | 14006 | > "task " '(verilog-sk-prompt-name) & ?\; \n |
| 14007 | > _ \n | 14007 | > _ \n |
| 14008 | > "begin" \n | 14008 | > "begin" \n |
| 14009 | > \n | 14009 | > \n |
| @@ -14013,7 +14013,7 @@ See also `verilog-header' for an alternative format." | |||
| 14013 | (define-skeleton verilog-sk-function | 14013 | (define-skeleton verilog-sk-function |
| 14014 | "Insert a function definition." | 14014 | "Insert a function definition." |
| 14015 | () | 14015 | () |
| 14016 | > "function [" '(verilog-sk-prompt-width) | -1 '(verilog-sk-prompt-name) ?; \n | 14016 | > "function [" '(verilog-sk-prompt-width) | -1 '(verilog-sk-prompt-name) ?\; \n |
| 14017 | > _ \n | 14017 | > _ \n |
| 14018 | > "begin" \n | 14018 | > "begin" \n |
| 14019 | > \n | 14019 | > \n |
| @@ -14208,13 +14208,13 @@ and the case items." | |||
| 14208 | '(setq input "state") | 14208 | '(setq input "state") |
| 14209 | > "// State registers for " str | -23 \n | 14209 | > "// State registers for " str | -23 \n |
| 14210 | '(setq verilog-sk-state str) | 14210 | '(setq verilog-sk-state str) |
| 14211 | > "reg [" '(verilog-sk-prompt-width) | -1 verilog-sk-state ", next_" verilog-sk-state ?; \n | 14211 | > "reg [" '(verilog-sk-prompt-width) | -1 verilog-sk-state ", next_" verilog-sk-state ?\; \n |
| 14212 | '(setq input nil) | 14212 | '(setq input nil) |
| 14213 | > \n | 14213 | > \n |
| 14214 | > "// State FF for " verilog-sk-state \n | 14214 | > "// State FF for " verilog-sk-state \n |
| 14215 | > "always @ ( " (read-string "clock:" "posedge clk") " or " (verilog-sk-prompt-reset) " ) begin" \n | 14215 | > "always @ ( " (read-string "clock:" "posedge clk") " or " (verilog-sk-prompt-reset) " ) begin" \n |
| 14216 | > "if ( " verilog-sk-reset " ) " verilog-sk-state " = 0; else" \n | 14216 | > "if ( " verilog-sk-reset " ) " verilog-sk-state " = 0; else" \n |
| 14217 | > verilog-sk-state " = next_" verilog-sk-state ?; \n | 14217 | > verilog-sk-state " = next_" verilog-sk-state ?\; \n |
| 14218 | > (- verilog-indent-level-behavioral) "end" (progn (electric-verilog-terminate-line) nil) | 14218 | > (- verilog-indent-level-behavioral) "end" (progn (electric-verilog-terminate-line) nil) |
| 14219 | > \n | 14219 | > \n |
| 14220 | > "// Next State Logic for " verilog-sk-state \n | 14220 | > "// Next State Logic for " verilog-sk-state \n |
diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 92de90c6d9b..dbfa87e207d 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el | |||
| @@ -487,8 +487,8 @@ Each alist element, which looks like (ELEMENT ...), is passed to | |||
| 487 | 487 | ||
| 488 | Elements might be (?\\=` ?\\=` _ \"\\='\\='\"), (?\\( ? _ \" )\") or (?{ \\n > _ \\n ?} >).") | 488 | Elements might be (?\\=` ?\\=` _ \"\\='\\='\"), (?\\( ? _ \" )\") or (?{ \\n > _ \\n ?} >).") |
| 489 | 489 | ||
| 490 | (defvar skeleton-pair-default-alist '((?( _ ?)) (?\)) | 490 | (defvar skeleton-pair-default-alist '((?\( _ ?\)) (?\)) |
| 491 | (?[ _ ?]) (?\]) | 491 | (?\[ _ ?\]) (?\]) |
| 492 | (?{ _ ?}) (?\}) | 492 | (?{ _ ?}) (?\}) |
| 493 | (?< _ ?>) (?\>) | 493 | (?< _ ?>) (?\>) |
| 494 | (?« _ ?») (?\») | 494 | (?« _ ?») (?\») |
diff --git a/lisp/woman.el b/lisp/woman.el index 720fe66be86..aa856c39577 100644 --- a/lisp/woman.el +++ b/lisp/woman.el | |||
| @@ -4420,7 +4420,7 @@ Needs doing properly!" | |||
| 4420 | ;; A field is contained between a pair of field delimiter | 4420 | ;; A field is contained between a pair of field delimiter |
| 4421 | ;; characters and consists of sub-strings separated by padding | 4421 | ;; characters and consists of sub-strings separated by padding |
| 4422 | ;; indicator characters: | 4422 | ;; indicator characters: |
| 4423 | (setq delim (string delim ?[ ?^ delim ?] ?* delim)) | 4423 | (setq delim (string delim ?\[ ?^ delim ?\] ?* delim)) |
| 4424 | (save-excursion | 4424 | (save-excursion |
| 4425 | (while (re-search-forward delim end t) | 4425 | (while (re-search-forward delim end t) |
| 4426 | (goto-char (match-beginning 0)) | 4426 | (goto-char (match-beginning 0)) |