[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 20b858e: Prefer \... to control chars in .el litera
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] master 20b858e: Prefer \... to control chars in .el literals |
|
Date: |
Thu, 29 Mar 2018 20:43:29 -0400 (EDT) |
branch: master
commit 20b858ef13f8f71fae6cbce5cdac31c4dd130600
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Prefer \... to control chars in .el literals
---
lisp/emacs-lisp/elint.el | 4 +-
lisp/emacs-lisp/nadvice.el | 6 +-
lisp/emacs-lisp/tcover-ses.el | 762 +++++++++++++++++++++---------------------
lisp/erc/erc-services.el | 8 +-
lisp/gnus/nnmail.el | 6 +-
lisp/help-fns.el | 10 +-
lisp/kmacro.el | 2 +-
lisp/org/org-ctags.el | 4 +-
lisp/progmodes/cc-mode.el | 2 +-
lisp/textmodes/texinfmt.el | 2 +-
lisp/vc/pcvs.el | 2 +-
lisp/woman.el | 8 +-
12 files changed, 408 insertions(+), 408 deletions(-)
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index eae0dac..391d3fd 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -1095,7 +1095,7 @@ Marks the function with their arguments, and returns a
list of variables."
(set-buffer (get-buffer-create docbuf))
(insert-file-contents-literally
(expand-file-name internal-doc-file-name doc-directory)))
- (while (re-search-forward " \\([VF]\\)" nil t)
+ (while (re-search-forward "\^_\\([VF]\\)" nil t)
(when (setq sym (intern-soft (buffer-substring (point)
(line-end-position))))
(if (string-equal (match-string 1) "V")
@@ -1104,7 +1104,7 @@ Marks the function with their arguments, and returns a
list of variables."
(if (boundp sym) (setq vars (cons sym vars)))
;; Function.
(when (fboundp sym)
- (when (re-search-forward "\\(^(fn.*)\\)? " nil t)
+ (when (re-search-forward "\\(^(fn.*)\\)?\^_" nil t)
(backward-char 1)
;; FIXME distinguish no args from not found.
(and (setq args (match-string 1))
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index e2e6825..4403e88 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -41,13 +41,13 @@
'((:around "\300\301\302\003#\207" 5)
(:before "\300\301\002\"\210\300\302\002\"\207" 4)
(:after "\300\302\002\"\300\301\003\"\210\207" 5)
- (:override "\300\301\"\207" 4)
+ (:override "\300\301\002\"\207" 4)
(:after-until "\300\302\002\"\206\013\000\300\301\002\"\207" 4)
(:after-while "\300\302\002\"\205\013\000\300\301\002\"\207" 4)
(:before-until "\300\301\002\"\206\013\000\300\302\002\"\207" 4)
(:before-while "\300\301\002\"\205\013\000\300\302\002\"\207" 4)
- (:filter-args "\300\302\301!\"\207" 5)
- (:filter-return "\301\300\302\"!\207" 5))
+ (:filter-args "\300\302\301\003!\"\207" 5)
+ (:filter-return "\301\300\302\003\"!\207" 5))
"List of descriptions of how to add a function.
Each element has the form (WHERE BYTECODE STACK) where:
WHERE is a keyword indicating where the function is added.
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 9c29311..21bc2ce 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -39,464 +39,464 @@
;;;Here are some macros that exercise SES. Set `pause' to t if you want the
;;;macros to pause after each step.
(let* ((pause nil)
- (x (if pause "q" ""))
- (y "ses-test.ses\r<"))
+ (x (if pause "\^Xq" ""))
+ (y "\^X\^Fses-test.ses\r\^[<"))
;;Fiddle with the existing spreadsheet
(fset 'ses-exercise-example
- (concat "" data-directory "ses-example.ses\r<"
- x "10"
- x " "
- x " "
- x "pses-center\r"
- x "p\r"
- x "\t\t"
- x "\r A9 B9\r"
- x ""
- x "\r 2\r"
- x ""
+ (concat "\^X\^F" data-directory "ses-example.ses\r\^[<"
+ x "\^U10\^N"
+ x "\^K"
+ x "\^_"
+ x "\^P\^P\^Fpses-center\r"
+ x "\^Fp\r"
+ x "\^U\^P\t\t"
+ x "\r\^B A9 B9\r"
+ x "\^U\^N\^B\^B\^B"
+ x "\r\^A\^K2\r"
+ x "\^N\^N\^F"
x "50\r"
- x "4 "
- x " "
- x " "
- x "(+ o\0"
- x "-1o \r"
- x " "
+ x "\^U4\^_"
+ x "\^C\^[\^L"
+ x "\^_"
+ x "(+ \^Xo\^N\^N\^F\0\^F\^F"
+ x "\^U-1\^Xo\^C\^R \^C\^S\r\^B"
+ x "\^_"
x))
;;Create a new spreadsheet
(fset 'ses-exercise-new
(concat y
- x "\"%.8g\"\r"
+ x "\^C\^P\"%.8g\"\r"
x "2\r"
- x ""
- x ""
- x "2"
+ x "\^O"
+ x "\^P"
+ x "\^U2\^O"
x "\"Header\r"
- x "(sqrt 1\r"
- x "pses-center\r"
+ x "(sqrt 1\r\^B"
+ x "pses-center\r\^F"
x "\t"
- x "(+ A2 A3\r"
- x "(* B2 A3\r"
- x "2"
- x "\rB3\r"
- x ""
+ x "\^P(+ A2 A3\r"
+ x "\^F(* B2 A3\r"
+ x "\^U2\^C\^[\^H"
+ x "\r\^?\^?\^?B3\r"
+ x "\^X\^S"
x))
;;Basic cell display
(fset 'ses-exercise-display
- (concat y ":(revert-buffer t t)\r"
- x ""
- x "\"Very long\r"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^E"
+ x "\"Very long\r\^B"
x "w3\r"
x "w3\r"
- x "(/ 1 0\r"
- x "234567\r"
- x "5w"
- x "\t1\r"
- x ""
- x "234567\r"
- x "\t"
- x ""
- x "345678\r"
- x "3w"
- x "\0>"
- x ""
- x ""
- x ""
- x ""
- x ""
- x ""
- x ""
- x "1\r"
- x ""
- x ""
- x "\"1234567-1234567-1234567\r"
- x "123\r"
- x "2"
- x "\"1234567-1234567-1234567\r"
- x "123\r"
- x "w8\r"
- x "\"1234567\r"
- x "w5\r"
+ x "(/ 1 0\r\^B"
+ x "234567\r\^B"
+ x "\^U5w"
+ x "\t1\r\^B"
+ x "\^B\^C\^C"
+ x "\^F234567\r\^B"
+ x "\t\^D\^B"
+ x "\^B\^C\^C"
+ x "345678\r\^B"
+ x "\^U3w"
+ x "\0\^[>"
+ x "\^C\^C"
+ x "\^X\^X"
+ x "\^E"
+ x "\^X\^X\^A"
+ x "\^E"
+ x "\^F\^E"
+ x "\^C\^C"
+ x "1\r\^B"
+ x "\^C\^C\^F"
+ x "\^E"
+ x "\^B\^B\^B\"1234567-1234567-1234567\r\^B"
+ x "123\r\^B"
+ x "\^U2\^O"
+ x "\^N\"1234567-1234567-1234567\r\^B"
+ x "123\r\^B"
+ x "\^F\^Fw8\r"
+ x "\^B\^B\"1234567\r"
+ x "\^N\^Bw5\r"
x))
;;Cell formulas
(fset 'ses-exercise-formulas
- (concat y ":(revert-buffer t t)\r"
+ (concat y "\^[:(revert-buffer t t)\r"
x "\t\t"
x "\t"
- x "(* B1 B2 D1\r"
- x "(* B2 B3\r"
- x "(apply '+ (ses-range B1 B3)\r"
- x "(apply 'ses+ (ses-range B1 B3)\r"
- x "(apply 'ses+ (ses-range A2 A3)\r"
- x "(mapconcat'number-to-string(ses-range B2 B4) \"-\"\r"
- x "(apply 'concat (reverse (ses-range A3 D3))\r"
- x "(* (+ A2 A3) (ses+ B2 B3)\r"
- x ""
- x "2"
- x "5\t"
- x "(apply 'ses+ (ses-range E1 E2)\r"
- x "(apply 'ses+ (ses-range A5 B5)\r"
- x "(apply 'ses+ (ses-range E1 F1)\r"
- x "(apply 'ses+ (ses-range D1 E1)\r"
+ x "(* B1 B2 D1\r\^B"
+ x "(* B2 B3\r\^B"
+ x "\^N(apply '+ (ses-range B1 B3)\r\^B"
+ x "(apply 'ses+ (ses-range B1 B3)\r\^B"
+ x "\^N(apply 'ses+ (ses-range A2 A3)\r\^B"
+ x "\^N(mapconcat'number-to-string(ses-range B2 B4) \"-\"\r\^B"
+ x "\^B(apply 'concat (reverse (ses-range A3 D3))\r\^B"
+ x "\^B(* (+ A2 A3) (ses+ B2 B3)\r\^B"
+ x "\^N"
+ x "\^U2\^O"
+ x "\^U5\t"
+ x "\^P(apply 'ses+ (ses-range E1 E2)\r\^B"
+ x "\^P(apply 'ses+ (ses-range A5 B5)\r\^B"
+ x "\^P(apply 'ses+ (ses-range E1 F1)\r\^B"
+ x "\^P(apply 'ses+ (ses-range D1 E1)\r\^B"
x "\t"
- x "(ses-average (ses-range A2 A5)\r"
- x "(apply 'ses+ (ses-range A5 A6)\r"
- x "k"
- x " "
- x ""
- x "2"
- x "3 "
- x "o"
- x "2o"
- x "3k"
- x "(ses-average (ses-range B3 E3)\r"
- x "k"
- x "12345678\r"
+ x "(ses-average (ses-range A2 A5)\r\^B"
+ x "\^N(apply 'ses+ (ses-range A5 A6)\r\^B"
+ x "\^B\^B\^[k"
+ x "\^N\^N\^K"
+ x "\^P\^P\^P\^O"
+ x "\^N\^U2\^O"
+ x "\^P\^U3\^K"
+ x "\^B\^B\^B\^[o"
+ x "\^F\^U2\^[o"
+ x "\^B\^U3\^[k"
+ x "\^F(ses-average (ses-range B3 E3)\r\^B"
+ x "\^B\^[k"
+ x "\^N\^P12345678\r\^B"
x))
;;Recalculating and reconstructing
(fset 'ses-exercise-recalc
- (concat y ":(revert-buffer t t)\r"
- x " "
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^C\^[\^L"
x "\t\t"
- x ""
- x "(/ 1 0\r"
- x ""
+ x "\^C\^C"
+ x "(/ 1 0\r\^B"
+ x "\^C\^C"
x "\n"
- x ""
- x "\"%.6g\"\r"
- x " "
- x ">nw"
- x "\0>xdelete-region\r"
- x " "
- x "8"
- x "\0>xdelete-region\r"
- x " "
- x ""
- x " k"
- x " "
- x "\"Very long\r"
- x ""
- x "\r\r"
- x ""
- x "o"
- x ""
- x "\"Very long2\r"
- x "o"
- x ""
- x "\rC3\r"
- x "\rC2\r"
- x "\0"
- x "\rC4\r"
- x "\rC2\r"
- x "\0"
- x ""
- x "xses-mode\r"
- x "<"
- x "2k"
+ x "\^C\^C"
+ x "\^C\^P\"%.6g\"\r"
+ x "\^C\^[\^L"
+ x "\^[>\^Xnw\^F\^F\^F"
+ x "\0\^[>\^[xdelete-region\r"
+ x "\^C\^[\^L"
+ x "\^U8\^N"
+ x "\0\^[>\^[xdelete-region\r"
+ x "\^C\^[\^L"
+ x "\^C\^N"
+ x "\^N\^K\^B\^[k"
+ x "\^C\^L"
+ x "\^B\"Very long\r"
+ x "\^P\^C\^T"
+ x "\^B\r\r"
+ x "\^N\^C\^T"
+ x "\^F\^[o"
+ x "\^F\^C\^T"
+ x "\^B\^B\"Very long2\r"
+ x "\^B\^[o\^F"
+ x "\^C\^T"
+ x "\r\^?\^?\^?C3\r"
+ x "\^N\r\^?\^?\^?C2\r"
+ x "\^P\0\^N\^F\^C\^C"
+ x "\r\^?\^?C4\r"
+ x "\^N\^N\r\^?\^?\^?C2\r"
+ x "\^F\0\^B\^P\^P"
+ x "\^C\^C"
+ x "\^[xses-mode\r"
+ x "\^[<\^O"
+ x "\^U2\^[k"
x))
;;Header line
(fset 'ses-exercise-header-row
- (concat y ":(revert-buffer t t)\r"
- x "<"
- x ">"
- x "6<"
- x ">"
- x "7<"
- x ">"
- x "8<"
- x "2<"
- x ">"
- x "3w"
- x "10<"
- x ">"
- x "2 "
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^X<"
+ x "\^X>"
+ x "\^U6\^X<"
+ x "\^X>"
+ x "\^U7\^X<"
+ x "\^X>"
+ x "\^U8\^X<"
+ x "\^U2\^X<"
+ x "\^X>"
+ x "\^F\^U3w\^B"
+ x "\^U10\^X<"
+ x "\^X>"
+ x "\^U2\^K"
x))
;;Detecting unsafe formulas and printers
(fset 'ses-exercise-unsafe
- (concat y ":(revert-buffer t t)\r"
+ (concat y "\^[:(revert-buffer t t)\r"
x "p(lambda (x) (delete-file x))\rn"
x "p(lambda (x) (delete-file \"ses-nothing\"))\ry"
- x "\0n"
- x "(delete-file \"x\"\rn"
- x "(delete-file \"ses-nothing\"\ry"
- x "\0n"
- x "(open-network-stream \"x\" nil \"localhost\" \"smtp\"\ry"
- x "\0n"
+ x "\0\^F\^W\^Yn"
+ x "\^N(delete-file \"x\"\rn"
+ x "(delete-file \"ses-nothing\"\ry\^B"
+ x "\0\^F\^W\^Yn"
+ x "(open-network-stream \"x\" nil \"localhost\" \"smtp\"\ry\^B"
+ x "\0\^F\^W\^Yn"
x))
;;Inserting and deleting rows
(fset 'ses-exercise-rows
- (concat y ":(revert-buffer t t)\r"
- x ""
- x "\"%s=\"\r"
- x "20"
- x "p\"%s+\"\r"
- x ""
- x "123456789\r"
- x "\021"
- x ""
- x " "
- x "(not B25\r"
- x "k"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^N\^F"
+ x "\^C\^P\"%s=\"\r"
+ x "\^U20\^O"
+ x "\^[p\"%s+\"\r"
+ x "\^N\^O"
+ x "123456789\r\^B"
+ x "\0\^U21\^N\^F"
+ x "\^C\^C"
+ x "\^[\^L"
+ x "\^P\^P(not B25\r\^B"
+ x "\^N\^[k"
x "jA3\r"
- x "19 "
- x " "
- x "100" ;Make this approx your CPU speed in MHz
+ x "\^U19\^K"
+ x "\^P\^F\^K"
+ x "\^U100\^O" ;Make this approx your CPU speed in MHz
x))
;;Inserting and deleting columns
(fset 'ses-exercise-columns
- (concat y ":(revert-buffer t t)\r"
- x "\"address@hidden"\r"
- x "o"
- x ""
- x "o"
- x " "
- x "k"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^C\^P\"address@hidden"\r"
+ x "\^[o"
+ x "\^O"
+ x "\^[o"
+ x "\^K"
+ x "\^[k"
x "w8\r"
- x "p\"%.7s*\"\r"
- x "o"
- x ""
- x "2o"
- x "3k"
- x "\"%.6g\"\r"
- x "26o"
- x "\026\t"
- x "26o"
- x "0\r"
- x "26\t"
- x "400"
- x "50k"
- x "\0D"
+ x "\^[p\"%.7s*\"\r"
+ x "\^[o"
+ x "\^F"
+ x "\^U2\^[o"
+ x "\^U3\^[k"
+ x "\^C\^P\"%.6g\"\r"
+ x "\^U26\^[o"
+ x "\0\^U26\t"
+ x "\^U26\^[o"
+ x "\^C\^[\^H0\r"
+ x "\^U26\t"
+ x "\^U400\^B"
+ x "\^U50\^[k"
+ x "\0\^N\^N\^F\^F\^C\^[\^SD"
x))
(fset 'ses-exercise-editing
- (concat y ":(revert-buffer t t)\r"
- x "1\r"
- x "('x\r"
- x ""
- x " "
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^N\^N\^N1\r\^B"
+ x "\^F(\^B'\^Fx\r\^B"
+ x "\^B\^P\^P\^P\^O"
+ x "\^_"
x "\r\r"
x "w9\r"
- x "\r.5\r"
- x "\r 10\r"
+ x "\^N\r\^B.5\r"
+ x "\^N\^F\r\^B 10\r"
x "w12\r"
- x "\r'\r"
- x "\r\r"
+ x "\r\^A'\r"
+ x "\r\^A\^D\r"
x "jA4\r"
- x "(+ A2 100\r"
- x "3\r"
+ x "(+ A2 100\r\^B"
+ x "\^P\^P3\r\^B"
x "jB1\r"
- x "(not A1\r"
- x "\"Very long\r"
- x ""
- x "h"
- x "H"
- x ""
- x ">\t"
- x ""
- x ""
- x "2"
- x ""
- x "o"
- x "h"
- x "\0"
- x "\"Also very long\r"
- x "H"
- x "\0'\r"
- x "'Trial\r"
- x "'qwerty\r"
- x "(concat o<\0"
- x "-1o\r"
- x "(apply '+ o<\0-1o\r"
- x "2"
- x "-2"
- x "-2"
- x "2"
- x " "
- x "H"
- x "\0"
- x "\"Another long one\r"
- x "H"
- x ""
- x "<"
- x ""
- x ">"
- x "\0"
+ x "(not A1\r\^B"
+ x "\^B\"Very long\r\^B"
+ x "\^C\^C"
+ x "\^[h"
+ x "\^[H"
+ x "\^C\^C"
+ x "\^[>\t"
+ x "\^P\^P\^D"
+ x "\^P\^D"
+ x "\^F\^F\^U2\^?"
+ x "\^P\^?"
+ x "\^[o"
+ x "\^[h"
+ x "\0\^O\^F"
+ x "\"Also very long\r\^B"
+ x "\^N\^F\^[H"
+ x "\0'\r\^B"
+ x "'Trial\r\^B"
+ x "\^N\^B'qwerty\r\^B"
+ x "\^F(concat \^Xo\^[<\0\^N\^N"
+ x "\^U-1\^Xo\^C\^R\r\^B"
+ x "(apply '+ \^Xo\^[<\0\^N\^F\^U-1\^Xo\^C\^S\r\^B"
+ x "\^P\^U2\^?"
+ x "\^U-2\^?"
+ x "\^U-2\^D"
+ x "\^U2\^D"
+ x "\^B\^P\^P\^K"
+ x "\^N\^F\^[H"
+ x "\^B\^P\0\^O"
+ x "\"Another long one\r\^B"
+ x "\^N\^N\^F\^[H"
+ x "\^A\^P\^E"
+ x "\^C\^C\^[<"
+ x "\^N\^E"
+ x "\^[>\^P\^O"
+ x "\0\^E\^F\^E"
x))
;;Sorting of columns
(fset 'ses-exercise-sort-column
- (concat y ":(revert-buffer t t)\r"
+ (concat y "\^[:(revert-buffer t t)\r"
x "\"Very long\r"
- x "99\r"
- x "o13\r"
+ x "\^F99\r"
+ x "\^F\^[o13\r"
x "(+ A3 B3\r"
x "7\r8\r(* A4 B4\r"
- x "\0A\r"
- x "\0B\r"
- x "\0C\r"
- x "o"
- x "\0C\r"
+ x "\0\^P\^P\^P\^C\^[\^SA\r"
+ x "\^N\0\^P\^P\^P\^C\^[\^SB\r"
+ x "\^P\^P\^F\0\^N\^N\^F\^F\^C\^[\^SC\r"
+ x "\^F\^[o\^P\^O"
+ x "\^B\0\^N\^N\^N\^U\^C\^[\^SC\r"
x))
;;Simple cell printers
(fset 'ses-exercise-cell-printers
- (concat y ":(revert-buffer t t)\r"
- x "\"4\t76\r"
- x "\"4\n7\r"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^F\"4\^Q\t76\r\^B"
+ x "\"4\^Q\n7\r\^B"
x "p\"{%S}\"\r"
x "p(\"[%s]\")\r"
x "p(\"<%s>\")\r"
- x "\0"
+ x "\^B\0\^F\^F"
x "p\r"
x "pnil\r"
x "pses-dashfill\r"
- x "48\r"
+ x "48\r\^B"
x "\t"
- x "\0p\r"
- x "p\r"
+ x "\^B\0\^Fp\r"
+ x "\^Fp\r"
x "pses-dashfill\r"
- x "\0pnil\r"
- x "5\r"
+ x "\^B\0\^F\^Fpnil\r"
+ x "5\r\^B"
x "pses-center\r"
- x "\"%s\"\r"
+ x "\^C\^P\"%s\"\r"
x "w8\r"
- x "p\r"
- x "p\"address@hidden"\r"
- x "\r"
- x "\"%.6g#\"\r"
- x "\"%.6g.\"\r"
- x "\"%.6g.\"\r"
- x "pidentity\r"
- x "6\r"
- x "\"UPCASE\r"
- x "pdowncase\r"
- x "(* 3 4\r"
- x "p(lambda (x) '(\"Hi\"))\r"
- x "p(lambda (x) '(\"Bye\"))\r"
+ x "\^[p\r"
+ x "\^[p\"address@hidden"\r"
+ x "\^C\^P\r"
+ x "\^C\^P\"%.6g#\"\r"
+ x "\^C\^P\"%.6g.\"\r"
+ x "\^C\^P\"%.6g.\"\r"
+ x "\^[pidentity\r"
+ x "6\r\^B"
+ x "\^N\"UPCASE\r\^B"
+ x "\^[pdowncase\r"
+ x "(* 3 4\r\^B"
+ x "p(lambda\^Q (x)\^Q '(\"Hi\"))\r"
+ x "p(lambda\^Q (x)\^Q '(\"Bye\"))\r"
x))
;;Spanning cell printers
(fset 'ses-exercise-spanning-printers
- (concat y ":(revert-buffer t t)\r"
- x "p\"%.6g*\"\r"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^[p\"%.6g*\"\r"
x "pses-dashfill-span\r"
- x "5\r"
+ x "5\r\^B"
x "pses-tildefill-span\r"
- x "\"4\r"
- x "p\"$%s\"\r"
- x "p(\"$%s\")\r"
- x "8\r"
- x "p(\"!%s!\")\r"
- x "\t\"12345678\r"
+ x "\"4\r\^B"
+ x "\^[p\"$%s\"\r"
+ x "\^[p(\"$%s\")\r"
+ x "8\r\^B"
+ x "\^[p(\"!%s!\")\r"
+ x "\t\"12345678\r\^B"
x "pses-dashfill-span\r"
- x "\"23456789\r"
+ x "\"23456789\r\^B"
x "\t"
- x "(not t\r"
- x "w6\r"
- x "\"5\r"
- x "o"
- x "k"
- x "k"
+ x "(not t\r\^B"
+ x "\^Bw6\r"
+ x "\"5\r\^B"
+ x "\^N\^F\^[o"
+ x "\^[k"
+ x "\^[k"
x "\t"
- x ""
- x "o"
- x "2k"
- x "k"
+ x "\^B\^P\^C\^C"
+ x "\^[o"
+ x "\^N\^U2\^[k"
+ x "\^B\^B\^[k"
x))
;;Cut/copy/paste - within same buffer
(fset 'ses-exercise-paste-1buf
- (concat y ":(revert-buffer t t)\r"
- x "\0w"
- x ""
- x "o"
- x "\"middle\r"
- x "\0"
- x "w"
- x "\0"
- x "w"
- x ""
- x ""
- x "2y"
- x "y"
- x "y"
- x ">"
- x "y"
- x ">y"
- x "<"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^N\0\^F\^[w"
+ x "\^C\^C\^P\^F\^Y"
+ x "\^N\^[o"
+ x "\"middle\r\^B"
+ x "\0\^F\^N\^F"
+ x "\^[w"
+ x "\^P\0\^F"
+ x "\^[w"
+ x "\^C\^C\^F\^N"
+ x "\^Y"
+ x "\^U2\^Yy"
+ x "\^F\^U\^Yy"
+ x "\^P\^P\^F\^U\^Yy"
+ x "\^[>"
+ x "\^Yy"
+ x "\^[>\^Yy"
+ x "\^[<"
x "p\"<%s>\"\r"
- x "pses-dashfill\r"
- x "\0"
- x ""
- x " "
- x "y"
- x "\r\0w"
- x "\r"
- x "3(+ G2 H1\r"
- x "\0w"
- x ">"
- x ""
- x "8(ses-average (ses-range G2 H2)\r"
- x "\0k"
- x "7"
- x ""
- x "(ses-average (ses-range E7 E9)\r"
- x "\0 "
- x ""
- x "(ses-average (ses-range E7 F7)\r"
- x "\0k"
- x ""
- x "(ses-average (ses-range D6 E6)\r"
- x "\0k"
- x ""
- x "2"
- x "\"Line A\r"
+ x "\^Fpses-dashfill\r"
+ x "\^B\0\^F\^F\^F\^N\^N\^N"
+ x "\^W"
+ x "\^_"
+ x "\^U\^Yy"
+ x "\r\0\^B\^B\^B\^[w"
+ x "\r\^F\^Y"
+ x "\^U3\^P(+ G2 H1\r"
+ x "\0\^B\^[w"
+ x "\^C\^C\^[>\^B"
+ x "\^Y"
+ x "\^B\^U8\^P(ses-average (ses-range G2 H2)\r\^B"
+ x "\0\^F\^W\^[k"
+ x "\^U7\^N"
+ x "\^Y"
+ x "\^P\^B(ses-average (ses-range E7 E9)\r\^B"
+ x "\0\^F\^W\^K"
+ x "\^N\^Y"
+ x "\^B\^B\^P(ses-average (ses-range E7 F7)\r\^B"
+ x "\0\^F\^W\^[k"
+ x "\^F\^Y"
+ x "\^B\^B\^P(ses-average (ses-range D6 E6)\r\^B"
+ x "\0\^F\^W\^[k"
+ x "\^F\^Y"
+ x "\^A\^U2\^O"
+ x "\"Line A\r\^B"
x "pses-tildefill-span\r"
- x "\"Subline A(1)\r"
+ x "\^N\^F\"Subline A(1)\r\^B"
x "pses-dashfill-span\r"
- x "\0w"
- x ""
- x ""
- x "\0w"
- x ""
+ x "\^B\^P\0\^N\^N\^N\^[w\^C\^C"
+ x "\^A\^P\^P\^P\^P\^P\^P"
+ x "\^Y"
+ x "\0\^N\^F\^F\^[w\^C\^C"
+ x "\^F\^Y"
x))
;;Cut/copy/paste - between two buffers
(fset 'ses-exercise-paste-2buf
- (concat y ":(revert-buffer t t)\r"
- x "o\"middle\r\0"
- x ""
- x "4bses-test.txt\r"
- x " "
- x "\"xxx\0"
- x "wo"
- x " "
- x ""
- x "o\"\0"
- x "wo"
- x "o123.45\0"
- x "o"
- x "o1 \0"
- x "o"
- x ">y"
- x "o symb\0"
- x "oy2y"
- x "o1\t\0"
- x "o"
- x "w9\np\"<%s>\"\n"
- x "o\n2\t\"3\nxxx\t5\n\0"
- x "oy"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^F\^N\^[o\"middle\r\^B\0\^F\^N\^F"
+ x "\^W"
+ x "\^X4bses-test.txt\r"
+ x " \^A\^Y"
+ x "\^E\"xxx\0\^B\^B\^B\^B"
+ x "\^[w\^Xo"
+ x "\^_"
+ x "\^Y"
+ x "\^Xo\^E\"\0\^B\^B\^B\^B\^B"
+ x "\^[w\^Xo\^Y"
+ x "\^Xo123.45\0\^B\^B\^B\^B\^B\^B"
+ x "\^W\^Xo\^Y"
+ x "\^Xo1 \^B\^B\0\^F\^F\^F\^F\^F\^F\^F"
+ x "\^W\^Xo\^Y"
+ x "\^[>\^Yy"
+ x "\^F\^Xo symb\0\^B\^B\^B\^B"
+ x "\^W\^Xo\^U\^Y\^[y\^U2\^[y"
+ x "\^Xo1\t\0\^B\^B"
+ x "\^W\^Xo\^B\^Y"
+ x "w9\n\^[p\"<%s>\"\n"
+ x "\^Xo\n2\t\"3\nxxx\t5\n\0\^P\^P"
+ x "\^W\^Xo\^Yy"
x))
;;Export text, import it back
(fset 'ses-exercise-import-export
- (concat y ":(revert-buffer t t)\r"
- x "\0xt"
- x "4bses-test.txt\r"
- x "\n-1o"
- x "xTo-1o"
- x "'crunch\r"
- x "pses-center-span\r"
- x "\0xT"
- x "o\n-1o"
- x "\0y"
- x "\0xt"
- x "\0y"
- x "12345678\r"
- x "'bunch\r"
- x "\0xtxT"
+ (concat y "\^[:(revert-buffer t t)\r"
+ x "\^N\^N\^F\0\^Fxt"
+ x "\^X4bses-test.txt\r"
+ x "\n\^Y\^U-1\^Xo"
+ x "xT\^Xo\^Y\^U-1\^Xo"
+ x "\^C\^C\^F'crunch\r\^B"
+ x "\^P\^P\^Ppses-center-span\r"
+ x "\0\^N\^N\^N\^NxT"
+ x "\^Xo\n\^Y\^U-1\^Xo"
+ x "\0\^Yy"
+ x "\^F\0\^B\^P\^Pxt"
+ x "\^N\^N\0\^U\^Yy"
+ x "12345678\r\^B"
+ x "\^F\^F'bunch\r"
+ x "\0\^P\^PxtxT"
x)))
(defun ses-exercise-macros ()
@@ -565,10 +565,10 @@ spreadsheet files with invalid formatting."
(let ((curcell '(A1 . A2))) (ses-check-curcell 'end))
(let ((curcell '(A1 . A2))) (ses-sort-column "B"))
(let ((curcell '(C1 . D2))) (ses-sort-column "B"))
- (execute-kbd-macro "jB10\n2")
+ (execute-kbd-macro "jB10\n\^U2\^D")
(execute-kbd-macro [?j ?B ?9 ?\n ?\C-@ ?\C-f ?\C-f cut])
- (progn (kill-new "x") (execute-kbd-macro ">n"))
- (execute-kbd-macro "\0w")))
+ (progn (kill-new "x") (execute-kbd-macro "\^[>\^Yn"))
+ (execute-kbd-macro "\^B\0\^[w")))
(condition-case nil
(progn
(eval x)
@@ -589,7 +589,7 @@ spreadsheet files with invalid formatting."
(defun ses-exercise-invalid-spreadsheets ()
"Execute code paths that detect invalid spreadsheet files."
;;Detect invalid spreadsheets
- (let ((p&d "\n\n \n(ses-cell A1 nil nil nil nil)\n\n")
+ (let ((p&d "\n\n\^L\n(ses-cell A1 nil nil nil nil)\n\n")
(cw "(ses-column-widths [7])\n")
(cp "(ses-column-printers [ses-center])\n")
(dp "(ses-default-printer \"%.7g\")\n")
@@ -603,12 +603,12 @@ spreadsheet files with invalid formatting."
"(1 2 x)"
"(1 2 -1)"
"(3 1 1)"
- "\n\n (2 1 1)"
- "\n\n \n(ses-cell)(2 1 1)"
- "\n\n \n(x)\n(2 1 1)"
- "\n\n\n \n(ses-cell A2)\n(2 2 2)"
- "\n\n\n \n(ses-cell B1)\n(2 2 2)"
- "\n\n \n(ses-cell A1 nil nil nil nil)\n(2 1 1)"
+ "\n\n\^L(2 1 1)"
+ "\n\n\^L\n(ses-cell)(2 1 1)"
+ "\n\n\^L\n(x)\n(2 1 1)"
+ "\n\n\n\^L\n(ses-cell A2)\n(2 2 2)"
+ "\n\n\n\^L\n(ses-cell B1)\n(2 2 2)"
+ "\n\n\^L\n(ses-cell A1 nil nil nil nil)\n(2 1 1)"
(concat p&d "(x)\n(x)\n(x)\n(x)\n" p11)
(concat p&d "(ses-column-widths)(x)\n(x)\n(x)\n" p11)
(concat p&d cw "(x)\n(x)\n(x)\n(2 1 1)")
@@ -671,7 +671,7 @@ spreadsheet files with invalid formatting."
(ses-exercise-invalid-spreadsheets)
;;Upgrade of old-style spreadsheet
(with-temp-buffer
- (insert " \n\n \n(ses-cell A1 nil nil nil
nil)\n\n(ses-column-widths [7])\n(ses-column-printers
[nil])\n(ses-default-printer \"%.7g\")\n\n( ;Global parameters (these are read
first)\n 1 ;SES file-format\n 1 ;numrows\n 1 ;numcols\n)\n\n")
+ (insert " \n\n\^L\n(ses-cell A1 nil nil nil
nil)\n\n(ses-column-widths [7])\n(ses-column-printers
[nil])\n(ses-default-printer \"%.7g\")\n\n( ;Global parameters (these are read
first)\n 1 ;SES file-format\n 1 ;numrows\n 1 ;numcols\n)\n\n")
(ses-load))
;;ses-vector-delete is always called from buffer-undo-list with the same
;;symbol as argument. We'll give it a different one here.
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 62201b0..ac49a3e 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -214,7 +214,7 @@ Example of use:
"identify" nil nil nil)
(Azzurra
"address@hidden"
- "/ns\\s-IDENTIFY\\s-password"
+ "\^B/ns\\s-IDENTIFY\\s-password\^B"
"NickServ"
"IDENTIFY" nil nil nil)
(BitlBee
@@ -223,7 +223,7 @@ Example of use:
"identify" nil nil nil)
(BRASnet
"address@hidden"
- "/NickServ\\s-IDENTIFY\\s- senha "
+ "\^B/NickServ\\s-IDENTIFY\\s-\^_senha\^_\^B"
"NickServ"
"IDENTIFY" nil "" nil)
(DALnet
@@ -262,7 +262,7 @@ Example of use:
nil
"NickServ"
"IDENTIFY" nil nil
- "You\\s-are\\s-successfully\\s-identified\\s-as\\s-")
+ "You\\s-are\\s-successfully\\s-identified\\s-as\\s-\^B")
(Rizon
"address@hidden"
"This\\s-nickname\\s-is\\s-registered\\s-and\\s-protected."
@@ -275,7 +275,7 @@ Example of use:
"auth" t nil nil)
(SlashNET
"address@hidden"
- "/msg\\s-NickServ\\s-IDENTIFY\\s- password"
+ "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
"address@hidden"
"IDENTIFY" nil nil nil))
"Alist of NickServer details, sorted by network.
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 9f06828..b2c86d3 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -723,7 +723,7 @@ If SOURCE is a directory spec, try to return the group name
component."
;; Skip all the headers in case there are more "From "s...
(or (search-forward "\n\n" nil t)
(search-forward-regexp "^[^:]*\\( .*\\|\\)$" nil t)
- (search-forward " "))
+ (search-forward "\^_\^L"))
(point)))
;; Unquote the ">From " line, if any.
(goto-char (point-min))
@@ -763,7 +763,7 @@ If SOURCE is a directory spec, try to return the group name
component."
(if (or (= (+ (point) content-length) (point-max))
(save-excursion
(goto-char (+ (point) content-length))
- (looking-at " ")))
+ (looking-at "\^_")))
(progn
(goto-char (+ (point) content-length))
(setq do-search nil))
@@ -772,7 +772,7 @@ If SOURCE is a directory spec, try to return the group name
component."
;; Go to the beginning of the next article - or to the end
;; of the buffer.
(when do-search
- (if (re-search-forward "^ " nil t)
+ (if (re-search-forward "^\^_" nil t)
(goto-char (match-beginning 0))
(goto-char (1- (point-max)))))
(delete-char 1) ; delete ^_
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index a592809..ec46a47 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -181,8 +181,8 @@ KIND should be `var' for a variable or `subr' for a
subroutine."
(expand-file-name internal-doc-file-name doc-directory)))
(let ((file (catch 'loop
(while t
- (let ((pnt (search-forward (concat " " name "\n"))))
- (re-search-backward " S\\(.*\\)")
+ (let ((pnt (search-forward (concat "\^_" name "\n"))))
+ (re-search-backward "\^_S\\(.*\\)")
(let ((file (match-string 1)))
(if (member file build-files)
(throw 'loop file)
@@ -1293,7 +1293,7 @@ BUFFER should be a buffer or a buffer name."
".AU Richard M. Stallman\n")
(insert-file-contents file)
(let (notfirst)
- (while (search-forward " " nil 'move)
+ (while (search-forward "\^_" nil 'move)
(if (= (following-char) ?S)
(delete-region (1- (point)) (line-end-position))
(delete-char -1)
@@ -1326,12 +1326,12 @@ BUFFER should be a buffer or a buffer name."
(insert "@")
(forward-char 1))
(goto-char (point-min))
- (while (search-forward " " nil t)
+ (while (search-forward "\^_" nil t)
(when (/= (following-char) ?S)
(setq type (char-after)
name (buffer-substring (1+ (point)) (line-end-position))
doc (buffer-substring (line-beginning-position 2)
- (if (search-forward " " nil 'move)
+ (if (search-forward "\^_" nil 'move)
(1- (point))
(point)))
alist (cons (list name type doc) alist))
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 76d2125..0acb7fc 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -813,7 +813,7 @@ The ARG parameter is unused."
(and (>= ch ?A) (<= ch ?Z))))
(setq key-seq (concat "\C-x\C-k" key-seq)
ok t))))
- (when (and (not (equal key-seq ""))
+ (when (and (not (equal key-seq "\^G"))
(or ok
(not (setq cmd (key-binding key-seq)))
(stringp cmd)
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 792f3fe..4898174 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -236,7 +236,7 @@ buffer position where the tag is found."
(with-current-buffer (get-file-buffer tags-file-name)
(goto-char (point-min))
(cond
- ((re-search-forward (format "^.*%s\\([0-9]+\\),\\([0-9]+\\)$"
+ ((re-search-forward (format "^.*\^?%s\^A\\([0-9]+\\),\\([0-9]+\\)$"
(regexp-quote tag)) nil t)
(let ((line (string-to-number (match-string 1)))
(pos (string-to-number (match-string 2))))
@@ -261,7 +261,7 @@ Return the list."
(visit-tags-table-buffer 'same)
(with-current-buffer (get-file-buffer tags-file-name)
(goto-char (point-min))
- (while (re-search-forward "^.*\\(.*\\)\\([0-9]+\\),\\([0-9]+\\)$"
+ (while (re-search-forward "^.*\^?\\(.*\\)\^A\\([0-9]+\\),\\([0-9]+\\)$"
nil t)
(push (substring-no-properties (match-string 1)) taglist)))
taglist)))
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 664f010..f425109 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1994,7 +1994,7 @@ Key bindings:
;; since it's practically impossible to write a regexp that reliably
;; matches such a construct. Other tools are necessary.
(defconst c-Java-defun-prompt-regexp
- "^[
\t]*\\(\\(\\(public\\|protected\\|private\\|const\\|abstract\\|synchronized\\|final\\|static\\|threadsafe\\|transient\\|native\\|volatile\\)\\s-+\\)*\\(\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*[][_$.a-zA-Z0-9]+\\|[[a-zA-Z]\\)\\s-*\\)\\s-+\\)\\)?\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*\\s-+\\)\\s-*\\)?\\([_a-zA-Z][^][
\t:;.,{}()=]*\\|\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)\\)\\s-*\\(([^);{}]*)\\)?\\([]
\t]*\\)\\(\\s-*\\<throws\\>\\s-*\\(\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)[,
\t\n\r\f\v]*\\)+\\)?\\s-*")
+ "^[
\t]*\\(\\(\\(public\\|protected\\|private\\|const\\|abstract\\|synchronized\\|final\\|static\\|threadsafe\\|transient\\|native\\|volatile\\)\\s-+\\)*\\(\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*[][_$.a-zA-Z0-9]+\\|[[a-zA-Z]\\)\\s-*\\)\\s-+\\)\\)?\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*\\s-+\\)\\s-*\\)?\\([_a-zA-Z][^][
\t:;.,{}()\^?=]*\\|\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)\\)\\s-*\\(([^);{}]*)\\)?\\([]
\t]*\\)\\(\\s-*\\<throws\\>\\s-*\\(\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)[,
\t\n\r\f\v]*\\)+\\)?\\s-*")
(easy-menu-define c-java-menu java-mode-map "Java Mode Commands"
(cons "Java" (c-lang-const c-mode-menu java)))
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index d6f451a..e89da65 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2447,7 +2447,7 @@ Use only the FILENAME arg; for Info, ignore the other
arguments to @image."
(defun texinfo-format-option ()
"Insert \\=` ... \\=' around arg unless inside a table; in that case, no
quotes."
;; `looking-at-backward' not available in v. 18.57, 20.2
- (if (not (search-backward "" ; searched-for character is a control-H
+ (if (not (search-backward "\^H"
(line-beginning-position)
t))
(insert "`" (texinfo-parse-arg-discard) "'")
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 5515e0c..501666a 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -700,7 +700,7 @@ OLD-FIS is the list of fileinfos on which the cvs command
was applied and
;; because of the call to `process-send-eof'.
(save-excursion
(goto-char (point-min))
- (while (re-search-forward "^\\^D+" nil t)
+ (while (re-search-forward "^\\^D\^H+" nil t)
(let ((inhibit-read-only t))
(delete-region (match-beginning 0) (match-end 0))))))
(let* ((fileinfos (cvs-parse-buffer 'cvs-parse-table dcd subdir))
diff --git a/lisp/woman.el b/lisp/woman.el
index c83a048..eab97fb 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1714,14 +1714,14 @@ Do not call directly!"
;; Interpret overprinting to indicate bold face:
(goto-char (point-min))
- (while (re-search-forward "\\(.\\)\\(\\(+\\1\\)+\\)" nil t)
+ (while (re-search-forward "\\(.\\)\\(\\(\^H+\\1\\)+\\)" nil t)
(woman-delete-match 2)
(woman-set-face (1- (point)) (point) 'woman-bold))
;; Interpret underlining to indicate italic face:
;; (Must be AFTER emboldening to interpret bold _ correctly!)
(goto-char (point-min))
- (while (search-forward "_" nil t)
+ (while (search-forward "_\^H" nil t)
(delete-char -2)
(woman-set-face (point) (1+ (point)) 'woman-italic))
@@ -2071,14 +2071,14 @@ alist in `woman-buffer-alist' and return nil."
;;; Syntax and display tables:
-(defconst woman-escaped-escape-char ?
+(defconst woman-escaped-escape-char ?\^\\
;; An arbitrary unused control character
"Internal character representation of escaped escape characters.")
(defconst woman-escaped-escape-string
(char-to-string woman-escaped-escape-char)
"Internal string representation of escaped escape characters.")
-(defconst woman-unpadded-space-char ?
+(defconst woman-unpadded-space-char ?\^]
;; An arbitrary unused control character
"Internal character representation of unpadded space characters.")
(defconst woman-unpadded-space-string
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 20b858e: Prefer \... to control chars in .el literals,
Paul Eggert <=