From f45b266d0eaa362a19a40fc8b0b7551e2964b64d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Mon, 10 Oct 2022 13:58:31 +0200 Subject: [PATCH] Don't use symbols that look package-qualified --- lisp/emacs-lisp/cl-generic.el | 6 +++--- lisp/files.el | 10 +++++----- lisp/frameset.el | 22 ++++++++++++---------- lisp/ldefs-boot.el | 4 ++-- lisp/nxml/rng-xsd.el | 2 +- lisp/progmodes/compile.el | 7 ++++--- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index b3ade3b8943..81dcfa3f2dd 100644 --- 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 43c5d7d1da1..f5fa6020053 100644 --- 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 a589f7b5d96..4919aff3aea 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -38,6 +38,8 @@ ;;; Code: +;;; FIXME: Do something about the face package name GUI. + (require 'cl-lib) @@ -465,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) @@ -1315,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 c9502fbb212..fa6ebf59c91 100644 --- 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 "\ @@ -26592,7 +26592,7 @@ it is disabled. ;;; Generated autoloads from nxml/rng-xsd.el -(put 'http://www.w3.org/2001/XMLSchema-datatypes 'rng-dt-compile #'rng-xsd-compile) +(put 'http-//www.w3.org/2001/XMLSchema-datatypes 'rng-dt-compile #'rng-xsd-compile) (autoload 'rng-xsd-compile "rng-xsd" "\ Provide W3C XML Schema as a RELAX NG datatypes library. NAME is a symbol giving the local name of the datatype. PARAMS is a diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el index bca432d92b8..98153b39b4a 100644 --- 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 ded5d2130e5..bfb5899318b 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -358,7 +358,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) \\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?\\(?:\\([:,]\\|$\\)\\)?" 1 2 3 (nil . 4)) - (ruby-Test::Unit + ;; PKG-FIXME + (|ruby-Test::Unit| "^ [[ ]?\\([^ (].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:in " 1 2) (gmake @@ -562,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 @@ -599,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) ;; -- 2.39.2