Intern keywords differently

Instead of something like (intern (format ":%s" ...)) do
(intern (format "%s" :keyword).  Likewise in C.

9 files changed, 9 insertions, 9 deletions

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index feefd391a87..5d1e58d303b 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)))
+  (intern (format "%s" symbol) :keyword))
 
 (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 beafee1d631..394ba1e1e0e 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)))))
+                             (intern (format "%s" name) :keyword))))
                    (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/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index f4df40249de..abcb3e3e6b5 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -819,7 +819,7 @@ test of free variables in the following ways:
          ;; Hopefully this shouldn't happen thanks to the cycle detection,
          ;; but in case it does happen, let's catch the error and give the
          ;; code a chance to macro-expand later.
-         (error "Eager macro-expansion failure: %S" err)
+         (error "Eager macro-expansion failure: %S in %S" err form)
          form))))))
 
 ;; ¡¡¡ Big Ugly Hack !!!
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 3146189be63..ed8228d97e9 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)))
+             for type = (intern (format "%s" (car check)) :keyword)
              ;; 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 e58f475d1c2..a68bec8d2de 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)))))
+  (or (keywordp sym) (keywordp (intern (format "%s" sym) :keyword))))
 
 
 ;; 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 76a1a71fabe..c488d6d10b9 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)))))
+  (let ((charset (intern (format "%s" (plist-get info :ascii-charset)) :keyword)))
     (org-export-translate s charset info)))
 
 
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index 9cf9125aebd..e3f0cb569f5 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))))
+  (let ((section (plist-get info (intern (format "html-%s" type) :keyword)))
         (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 5f62cd1c040..dbc23be5875 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))))
+            (let ((property (intern (format "inbuffer-%s" setting) :keyword)))
               (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 56bb4b74df3..6b8925b0db4 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)))
+              (plist-get info (intern (format "filter-%s" type) :keyword))
               (let ((blank (or (org-element-property :post-blank data) 0)))
                 (if (eq (org-element-class data parent) 'object)
                     (concat results (make-string blank ?\s))