diff options
author | Alan Mackenzie <acm@muc.de> | 2015-04-05 12:41:45 +0000 |
---|---|---|
committer | Alan Mackenzie <acm@muc.de> | 2015-04-05 12:49:14 +0000 |
commit | 2056db3fada56038664c4fa079ef1e034f64e3a5 (patch) | |
tree | 5a3d864152cb9793353fa4be3578907af1cf1989 /lisp/progmodes/hideif.el | |
parent | 5842e489eef061766a747e26ca81e1ef6e2ece5a (diff) | |
download | emacs-2056db3fada56038664c4fa079ef1e034f64e3a5.tar.gz |
Rationalize use of c[ad]+r, expunging cl-c[ad]\{3,4\}r.
Also expunge eudc-c[ad]+r.
* subr.el (internal--compiler-macro-cXXr): "New" function, copied
from cl--compiler-macro-cXXr.
(caar, cadr, cdar, cddr): Change from defsubsts to defuns with
the above compiler-macro.
* net/eudc.el (eudc-cadr, eudc-cdar, eudc-caar, eudc-cdaar): Remove.
* emacs-lisp/cl.el (Top level dolist doing defaliases): Remove
caaar, etc., from list of new alias functions.
* emacs-lisp/cl-lib.el (cl-caaar, etc): Rename to caaar, etc.
(gen-cXXr--rawname, gen-cXXr-all-cl-aliases): New function/macro
which generate obsolete cl- aliases for caaar, etc. Invoke them.
* desktop.el:
* edmacro.el:
* emacs-lisp/cl-macs.el:
* frameset.el:
* ibuffer.el:
* mail/footnote.el:
* net/dbus.el:
* net/eudc-export.el:
* net/eudc.el:
* net/eudcb-ph.el:
* net/rcirc.el:
* net/secrets.el:
* play/5x5.el:
* play/decipher.el:
* play/hanoi.el:
* progmodes/hideif.el:
* ses.el: Replace cl-caaar, eudc-cadr, etc. with caaar and cadr, etc.
Diffstat (limited to 'lisp/progmodes/hideif.el')
-rw-r--r-- | lisp/progmodes/hideif.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 7f2fd9274f7..64913c2e014 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -663,8 +663,8 @@ that form should be displayed.") (setq tok (cadr tokens)) (if (eq (car tokens) 'hif-lparen) (if (and (hif-if-valid-identifier-p tok) - (eq (cl-caddr tokens) 'hif-rparen)) - (setq tokens (cl-cdddr tokens)) + (eq (caddr tokens) 'hif-rparen)) + (setq tokens (cdddr tokens)) (error "#define followed by non-identifier: %S" tok)) (setq tok (car tokens) tokens (cdr tokens)) @@ -730,7 +730,7 @@ detecting self-reference." result)) ;; Argument list is nil, direct expansion (setq rep (hif-expand-token-list - (cl-caddr rep) ; Macro's token list + (caddr rep) ; Macro's token list tok expand_list)) ;; Replace all remaining references immediately (setq remains (cl-substitute tok rep remains)) |