Allow intern with ":xyz" again

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 5d1e58d303bf0297e347b2339dfb053bf512b941..feefd391a877cbb146a5b815b0042674048e767e 100644 (file)
--- 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 394ba1e1e0ee7b0f106d828044d95676c0a0d3de..beafee1d631fec98465d64741a18f643d33a9205 100644 (file)
--- 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 ed8228d97e9867d0949f437f52501c475e63b562..3146189be63535af6d63b3636a03901490b64ac5 100644 (file)
--- 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 a68bec8d2de15072beaadf0e666464712fc6ed9a..e58f475d1c2a8653da862952e23e84c3c0d4134c 100644 (file)
--- 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 c488d6d10b927c7c1e0a1cffcf8d51dd6cda9cb6..76a1a71fabe526aa6d2367eaff9e2278925d0f2d 100644 (file)
--- 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 e3f0cb569f590d4279c1a4267ee342b41e5779d9..9cf9125aebd08ec46992e330f0a335c79b792d5a 100644 (file)
--- 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 dbc23be5875039a1ef755ced1d4210d338e06cbd..5f62cd1c0403bbf11837696e3a5f8605c3f38c9d 100644 (file)
--- 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 6b8925b0db47630b601bcf441f29c2a92c34851a..56bb4b74df3595551ff123560d72c0a5ca933253 100644 (file)
--- 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 6cbe26bb8b4b956b030cba2067faebd6e6c60788..d6082227c5270b9aecb7c27d87739de51088bf41 100644 (file)
--- 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)))