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/net/dbus.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/net/dbus.el')
| -rw-r--r-- | lisp/net/dbus.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index b2c1ba883a4..4f63374a9b6 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -869,7 +869,7 @@ association to the service from D-Bus." ;; Service. (string-equal service (cadr e)) ;; Non-empty object path. - (cl-caddr e) + (caddr e) (throw :found t))))) dbus-registered-objects-table) nil)))) @@ -1474,7 +1474,7 @@ name of the property, and its value. If there are no properties, bus service path dbus-interface-properties "GetAll" :timeout 500 interface) result) - (add-to-list 'result (cons (car dict) (cl-caadr dict)) 'append))))) + (add-to-list 'result (cons (car dict) (caadr dict)) 'append))))) (defun dbus-register-property (bus service path interface property access value @@ -1672,7 +1672,7 @@ and \"org.freedesktop.DBus.Properties.GetAll\", which is slow." (if (cadr entry2) ;; "sv". (dolist (entry3 (cadr entry2)) - (setcdr entry3 (cl-caadr entry3))) + (setcdr entry3 (caadr entry3))) (setcdr entry2 nil))))) ;; Fallback: collect the information. Slooow! |