Revert the escaping of symbol names in lisp files

diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 81dcfa3f2dd7bc0ed41b53c774290012307740d4..b3ade3b89430ce23c5a19719165fc7cea73dba8b 100644 (file)
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -208,12 +208,12 @@ SPECIALIZERS-FUNCTION takes as first argument a tag value TAG
   (let ((cl--generic-edebug-name (car name)))
     (funcall pf specs)))
 
-(defun cl--generic-edebug-make-name (in--method _oldname &rest quals-and-args)
+(defun cl--generic-edebug-make-name (in:method _oldname &rest quals-and-args)
   ;; The name to use in Edebug for a method: use the generic
   ;; function's name plus all its qualifiers and finish with
   ;; its specializers.
   (pcase-let*
-      ((basename (if in--method cl--generic-edebug-name (pop quals-and-args)))
+      ((basename (if in:method cl--generic-edebug-name (pop quals-and-args)))
        (args (car (last quals-and-args)))
        (`(,spec-args . ,_) (cl--generic-split-args args))
        (specializers (mapcar (lambda (spec-arg)
@@ -255,7 +255,7 @@ DEFAULT-BODY, if present, is used as the body of a default method.
                               [&name
                                [[&rest cl-generic--method-qualifier-p]
                                 listp] ;Formal args
-                               cl--generic-edebug-make-name in--method]
+                               cl--generic-edebug-make-name in:method]
                               lambda-doc
                               def-body)]]
              def-body)))

diff --git a/lisp/files.el b/lisp/files.el
index f5fa60200534c9be5e28a4c18a5be033ea846879..43c5d7d1da14263a2c56de06c1f7241555348376 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7607,20 +7607,20 @@ If DIR's free space cannot be obtained, this function returns nil."
         (s " ")
         (yyyy "[0-9][0-9][0-9][0-9]")
         (dd "[ 0-3][0-9]")
-        (HH\:MM "[ 0-2][0-9][:.][0-5][0-9]")
+        (HH:MM "[ 0-2][0-9][:.][0-5][0-9]")
         (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
         (zone "[-+][0-2][0-9][0-5][0-9]")
         (iso-mm-dd "[01][0-9]-[0-3][0-9]")
-        (iso-time (concat HH\:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
+        (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
         (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
                      "\\|" yyyy "-" iso-mm-dd "\\)"))
         (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
                          s "+"
-                         "\\(" HH\:MM "\\|" yyyy "\\)"))
+                         "\\(" HH:MM "\\|" yyyy "\\)"))
         (western-comma (concat month s "+" dd "," s "+" yyyy))
          ;; This represents the date in strftime(3) format "%e-%b-%Y"
          ;; (aka "%v"), as it is the default for many ls incarnations.
-         (DD-MMM-YYYY (concat dd "-" month "-" yyyy s HH\:MM))
+         (DD-MMM-YYYY (concat dd "-" month "-" yyyy s HH:MM))
         ;; Japanese MS-Windows ls-lisp has one-digit months, and
         ;; omits the Kanji characters after month and day-of-month.
         ;; On Mac OS X 10.3, the date format in East Asian locales is
@@ -7629,7 +7629,7 @@ If DIR's free space cannot be obtained, this function returns nil."
         (east-asian
          (concat "\\(" mm l "?" s dd l "?" s "+"
                  "\\|" dd s mm s "+" "\\)"
-                 "\\(" HH\:MM "\\|" yyyy l "?" "\\)")))
+                 "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
         ;; The "[0-9]" below requires the previous column to end in a digit.
         ;; This avoids recognizing `1 may 1997' as a date in the line:
         ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 4919aff3aea184019b1e72077a754a47e142c833..81dcbe4695e3cce15f1e33d27f7b7789cf33420e 100644 (file)
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -467,14 +467,14 @@ DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
      (frameset--text-pixel-height . :save)
      (frameset--text-pixel-width  . :save)
      (fullscreen                  . frameset-filter-shelve-param)
-     (GUI-bottom                 . frameset-filter-unshelve-param)
-     (GUI-font                    . frameset-filter-unshelve-param)
-     (GUI-fullscreen              . frameset-filter-unshelve-param)
-     (GUI-height                  . frameset-filter-unshelve-param)
-     (GUI-left                    . frameset-filter-unshelve-param)
-     (GUI-right                   . frameset-filter-unshelve-param)
-     (GUI-top                     . frameset-filter-unshelve-param)
-     (GUI-width                   . frameset-filter-unshelve-param)
+     (GUI:bottom                  . frameset-filter-unshelve-param)
+     (GUI:font                    . frameset-filter-unshelve-param)
+     (GUI:fullscreen              . frameset-filter-unshelve-param)
+     (GUI:height                  . frameset-filter-unshelve-param)
+     (GUI:left                    . frameset-filter-unshelve-param)
+     (GUI:right                   . frameset-filter-unshelve-param)
+     (GUI:top                     . frameset-filter-unshelve-param)
+     (GUI:width                   . frameset-filter-unshelve-param)
      (height                      . frameset-filter-shelve-param)
      (left                        . frameset-filter-shelve-param)
      (parent-frame                . :never)
@@ -1317,8 +1317,8 @@ All keyword parameters default to nil."
                   ;; position info from a GUI session in some,
                   ;; possibly distant, past.
                   (when (and (frameset-switch-to-gui-p frame-cfg)
-                             (null (cdr (assq 'GUI-top frame-cfg)))
-                             (null (cdr (assq 'GUI-left frame-cfg))))
+                             (null (cdr (assq 'GUI:top frame-cfg)))
+                             (null (cdr (assq 'GUI:left frame-cfg))))
                     (setq dx (+ dx 20)
                           dy (+ dy 10)))
                  ;; OK, we're ready at last to create (or reuse) a frame and

diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index fa6ebf59c91f0a8e61b0cca14307fa965bdc0500..20588c5e31ba58cec317a4cc7ceab5fd33fa18bf 100644 (file)
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -12753,7 +12753,7 @@ and choose the directory as the fortune-file.
 (defvar frameset-session-filter-alist (append '((left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) (mapcar (lambda (p) (cons p :never)) frame-internal-parameters)) "\
 Minimum set of parameters to filter for live (on-session) framesets.
 DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
-(defvar frameset-persistent-filter-alist (append '((background-color . frameset-filter-sanitize-color) (bottom . frameset-filter-shelve-param) (buffer-list . :never) (buffer-predicate . :never) (buried-buffer-list . :never) (client . :never) (delete-before . :never) (font . frameset-filter-font-param) (font-backend . :never) (foreground-color . frameset-filter-sanitize-color) (frameset--text-pixel-height . :save) (frameset--text-pixel-width . :save) (fullscreen . frameset-filter-shelve-param) (GUI-bottom . frameset-filter-unshelve-param) (GUI-font . frameset-filter-unshelve-param) (GUI-fullscreen . frameset-filter-unshelve-param) (GUI-height . frameset-filter-unshelve-param) (GUI-left . frameset-filter-unshelve-param) (GUI-right . frameset-filter-unshelve-param) (GUI-top . frameset-filter-unshelve-param) (GUI-width . frameset-filter-unshelve-param) (height . frameset-filter-shelve-param) (left . frameset-filter-shelve-param) (parent-frame . :never) (mouse-wheel-frame . :never) (right . frameset-filter-shelve-param) (top . frameset-filter-shelve-param) (tty . frameset-filter-tty-to-GUI) (tty-type . frameset-filter-tty-to-GUI) (width . frameset-filter-shelve-param) (window-system . :never)) frameset-session-filter-alist) "\
+(defvar frameset-persistent-filter-alist (append '((background-color . frameset-filter-sanitize-color) (bottom . frameset-filter-shelve-param) (buffer-list . :never) (buffer-predicate . :never) (buried-buffer-list . :never) (client . :never) (delete-before . :never) (font . frameset-filter-font-param) (font-backend . :never) (foreground-color . frameset-filter-sanitize-color) (frameset--text-pixel-height . :save) (frameset--text-pixel-width . :save) (fullscreen . frameset-filter-shelve-param) (GUI:bottom . frameset-filter-unshelve-param) (GUI:font . frameset-filter-unshelve-param) (GUI:fullscreen . frameset-filter-unshelve-param) (GUI:height . frameset-filter-unshelve-param) (GUI:left . frameset-filter-unshelve-param) (GUI:right . frameset-filter-unshelve-param) (GUI:top . frameset-filter-unshelve-param) (GUI:width . frameset-filter-unshelve-param) (height . frameset-filter-shelve-param) (left . frameset-filter-shelve-param) (parent-frame . :never) (mouse-wheel-frame . :never) (right . frameset-filter-shelve-param) (top . frameset-filter-shelve-param) (tty . frameset-filter-tty-to-GUI) (tty-type . frameset-filter-tty-to-GUI) (width . frameset-filter-shelve-param) (window-system . :never)) frameset-session-filter-alist) "\
 Parameters to filter for persistent framesets.
 DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
 (defvar frameset-filter-alist frameset-persistent-filter-alist "\

diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el
index 98153b39b4ae264331b64680fd2e263adc609d59..bca432d92b829d4d9b9dbbd288e3759365a11278 100644 (file)
--- a/lisp/nxml/rng-xsd.el
+++ b/lisp/nxml/rng-xsd.el
@@ -40,7 +40,7 @@
 (require 'xsd-regexp)
 
 ;;;###autoload
-(put '|http://www.w3.org/2001/XMLSchema-datatypes|
+(put 'http://www.w3.org/2001/XMLSchema-datatypes
      'rng-dt-compile
      #'rng-xsd-compile)
 

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index a0786cb7596995304bf7cc602fe61d9caed45a1c..571942a0a8ebfb6080d55c291a7b0fba62f3eb9f 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -563,7 +563,7 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
      (0 'default)
      (1 compilation-error-face) (2 compilation-line-face))
 
-    (|perl--Pod::Checker|
+    (perl--Pod::Checker
      ;; podchecker error messages, per Pod::Checker.
      ;; The style is from the Pod::Checker::poderror() function, eg.
      ;; *** ERROR: Spurious text after =cut at line 193 in file foo.pm
@@ -600,7 +600,7 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
      "^\\(.*NOK.*\\)?# Test [0-9]+ got:.* (\\([^ \t\r\n]+\\) at line \
 \\([0-9]+\\)\\( fail #[0-9]+\\)?)"
      2 3)
-    (|perl--Test::Harness|
+    (perl--Test::Harness
      ;; perl Test::Harness output, eg.
      ;; NOK 1# Test 1 got: "1234" (t/foo.t at line 46)
      ;;