diff options
| author | Joakim Verona | 2012-06-19 18:24:34 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-06-19 18:24:34 +0200 |
| commit | 58a90697e8f15a2722100ac489df200ad31d3086 (patch) | |
| tree | b4323b7061485eb57e6d4a31cd7b9be26b446c74 | |
| parent | 32d8ff0e7c43e0174943731690db1ad30ae1a538 (diff) | |
| download | emacs-58a90697e8f15a2722100ac489df200ad31d3086.tar.gz emacs-58a90697e8f15a2722100ac489df200ad31d3086.zip | |
lisp/emacs-lisp/cl-loaddefs.el annoyingly has to be handmerged.
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index ef89bf81687..7b1f8465dc5 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el | |||
| @@ -267,7 +267,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value. | |||
| 267 | ;;;;;; cl-return cl-block cl-etypecase cl-typecase cl-ecase cl-case | 267 | ;;;;;; cl-return cl-block cl-etypecase cl-typecase cl-ecase cl-case |
| 268 | ;;;;;; cl-load-time-value cl-eval-when cl-destructuring-bind cl-function | 268 | ;;;;;; cl-load-time-value cl-eval-when cl-destructuring-bind cl-function |
| 269 | ;;;;;; cl-defmacro cl-defun cl-gentemp cl-gensym) "cl-macs" "cl-macs.el" | 269 | ;;;;;; cl-defmacro cl-defun cl-gentemp cl-gensym) "cl-macs" "cl-macs.el" |
| 270 | ;;;;;; "57801d8e4d72553371d59eca7b44292f") | 270 | ;;;;;; "178bb5377dbd371f1038a7bf5f4d7f29") |
| 271 | ;;; Generated autoloads from cl-macs.el | 271 | ;;; Generated autoloads from cl-macs.el |
| 272 | 272 | ||
| 273 | (autoload 'cl-gensym "cl-macs" "\ | 273 | (autoload 'cl-gensym "cl-macs" "\ |