[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
pkg df1e4c1e51 34/76: Allow intern with ":xyz" again
From: |
Gerd Moellmann |
Subject: |
pkg df1e4c1e51 34/76: Allow intern with ":xyz" again |
Date: |
Fri, 21 Oct 2022 00:16:12 -0400 (EDT) |
branch: pkg
commit df1e4c1e51381462c6b53cfb9af6332affbffbfb
Author: Gerd Möllmann <gerd@gnu.org>
Commit: Gerd Möllmann <gerd@gnu.org>
Allow intern with ":xyz" again
---
lisp/auth-source.el | 2 +-
lisp/emacs-lisp/cl-macs.el | 2 +-
lisp/net/nsm.el | 2 +-
lisp/obsolete/cl-compat.el | 2 +-
lisp/org/ox-ascii.el | 2 +-
lisp/org/ox-html.el | 2 +-
lisp/org/ox-koma-letter.el | 2 +-
lisp/org/ox.el | 2 +-
test/lisp/erc/resources/erc-d/erc-d.el | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 5d1e58d303..feefd391a8 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1160,7 +1160,7 @@ FILE is the file from which we obtained this token."
(point-max))))))
(defun auth-source--symbol-keyword (symbol)
- (intern (format "%s" symbol) :keyword))
+ (intern (format ":%s" symbol)))
(defun auth-source-netrc-normalize (alist filename)
(mapcar (lambda (entry)
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 394ba1e1e0..beafee1d63 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -611,7 +611,7 @@ its argument list allows full Common Lisp conventions."
;; shouldn't affect the key's name (bug#12367).
(if (eq ?_ (aref name 0))
(setq name (substring name 1)))
- (intern (format "%s" name) :keyword))))
+ (intern (format ":%s" name)))))
(varg (if (consp (car arg)) (cadar arg) (car arg)))
(def (if (cdr arg) (cadr arg)
;; The ordering between those two or clauses is
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index ed8228d97e..3146189be6 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -273,7 +273,7 @@ See also: `network-security-protocol-checks' and
`nsm-noninteractive'"
(let* ((results
(cl-loop
for check in network-security-protocol-checks
- for type = (intern (format "%s" (car check)) :keyword)
+ for type = (intern (format ":%s" (car check)))
;; Skip the check if the user has already said that this
;; host is OK for this type of "error".
for result = (and (not (memq type
diff --git a/lisp/obsolete/cl-compat.el b/lisp/obsolete/cl-compat.el
index a68bec8d2d..e58f475d1c 100644
--- a/lisp/obsolete/cl-compat.el
+++ b/lisp/obsolete/cl-compat.el
@@ -56,7 +56,7 @@
(cl-list* 'defconst x (list 'quote x) (and doc (list doc))))
(defun keyword-of (sym)
- (or (keywordp sym) (keywordp (intern (format "%s" sym) :keyword))))
+ (or (keywordp sym) (keywordp (intern (format ":%s" sym)))))
;; Multiple values. Note that the new package uses a different
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index c488d6d10b..76a1a71fab 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/ox-ascii.el
@@ -1157,7 +1157,7 @@ holding export options."
(defun org-ascii--translate (s info)
"Translate string S according to specified language and charset.
INFO is a plist used as a communication channel."
- (let ((charset (intern (format "%s" (plist-get info :ascii-charset))
:keyword)))
+ (let ((charset (intern (format ":%s" (plist-get info :ascii-charset)))))
(org-export-translate s charset info)))
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index e3f0cb569f..9cf9125aeb 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -1979,7 +1979,7 @@ INFO is a plist used as a communication channel."
"Return document preamble or postamble as a string, or nil.
TYPE is either `preamble' or `postamble', INFO is a plist used as a
communication channel."
- (let ((section (plist-get info (intern (format "html-%s" type) :keyword)))
+ (let ((section (plist-get info (intern (format ":html-%s" type))))
(spec (org-html-format-spec info)))
(when section
(let ((section-contents
diff --git a/lisp/org/ox-koma-letter.el b/lisp/org/ox-koma-letter.el
index dbc23be587..5f62cd1c04 100644
--- a/lisp/org/ox-koma-letter.el
+++ b/lisp/org/ox-koma-letter.el
@@ -774,7 +774,7 @@ a communication channel."
(let* ((check-scope
;; Non-nil value when SETTING was defined in SCOPE.
(lambda (setting)
- (let ((property (intern (format "inbuffer-%s" setting) :keyword)))
+ (let ((property (intern (format ":inbuffer-%s" setting))))
(if (eq scope 'global)
(eq (plist-get info property) 'koma-letter:empty)
(not (eq (plist-get info property) 'koma-letter:empty))))))
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 6b8925b0db..56bb4b74df 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -1969,7 +1969,7 @@ Return a string."
;; as in the original buffer, and call appropriate filters.
(t
(org-export-filter-apply-functions
- (plist-get info (intern (format "filter-%s" type) :keyword))
+ (plist-get info (intern (format ":filter-%s" type)))
(let ((blank (or (org-element-property :post-blank data) 0)))
(if (eq (org-element-class data parent) 'object)
(concat results (make-string blank ?\s))
diff --git a/test/lisp/erc/resources/erc-d/erc-d.el
b/test/lisp/erc/resources/erc-d/erc-d.el
index 6cbe26bb8b..d6082227c5 100644
--- a/test/lisp/erc/resources/erc-d/erc-d.el
+++ b/test/lisp/erc/resources/erc-d/erc-d.el
@@ -951,7 +951,7 @@ appearing among DIALOGS."
erc-d-match-handlers))))
(pcase-dolist (`(,var . ,def) defaults)
(push (or (plist-get kwds var) def) args)
- (push (intern (format "dialog-%s" var) :keyword) args))
+ (push (intern (format ":dialog-%s" var)) args))
(apply #'erc-d--start host service (or server-name erc-d-server-name)
args)))
- pkg 76d59f8a03 60/76: Fix missing ')', (continued)
- pkg 76d59f8a03 60/76: Fix missing ')', Gerd Moellmann, 2022/10/21
- pkg 73b617eaa9 64/76: Change package symbol table layout, Gerd Moellmann, 2022/10/21
- pkg 0976c09890 37/76: Fix printing of confusing symbol names, Gerd Moellmann, 2022/10/21
- pkg aaf12c12b6 32/76: Some scribbling, Gerd Moellmann, 2022/10/21
- pkg 963de7cafe 35/76: More scribbling, Gerd Moellmann, 2022/10/21
- pkg 90c070fec6 59/76: Restore obarray.el to return vectors, Gerd Moellmann, 2022/10/21
- pkg 74da61ff09 74/76: Remove a call to pkg_break, Gerd Moellmann, 2022/10/21
- pkg cc6095482b 73/76: Add pkg_set_status and Lisp defun for it, Gerd Moellmann, 2022/10/21
- pkg 7acb6c5ca1 68/76: Intrdduce pkg_find_symbol, Gerd Moellmann, 2022/10/21
- pkg 55cef2c78c 69/76: Some cleanup in pkg.c and lisp.h, Gerd Moellmann, 2022/10/21
- pkg df1e4c1e51 34/76: Allow intern with ":xyz" again,
Gerd Moellmann <=
- pkg 513f5a0b90 21/76: Remove obarrays, Gerd Moellmann, 2022/10/21
- pkg 051a17f540 63/76: Fix some warnings, Gerd Moellmann, 2022/10/21
- pkg 0f4b419fa3 65/76: Remove unused function prototype from lisp.h, Gerd Moellmann, 2022/10/21
- pkg adf7b760f2 12/76: More symbol reading, Gerd Moellmann, 2022/10/21
- pkg e2b79c2c5a 14/76: Revert the escaping of symbol names in lisp files, Gerd Moellmann, 2022/10/21
- pkg 4d4690f8cf 75/76: Handle keywords in image specs, Gerd Moellmann, 2022/10/21
- pkg f45b266d0e 03/76: Don't use symbols that look package-qualified, Gerd Moellmann, 2022/10/21
- pkg 06cfa629a5 05/76: Print symbols differently, Gerd Moellmann, 2022/10/21
- pkg 54a08db92b 01/76: Basic functionality for packages, Gerd Moellmann, 2022/10/21
- pkg 3e29407122 10/76: And more fixes, Gerd Moellmann, 2022/10/21