diff options
| author | Joakim Verona <joakim@verona.se> | 2015-01-22 12:52:42 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2015-01-22 12:52:42 +0100 |
| commit | 5693f3de69f9db99252b2f4eb1c7178fdec2a210 (patch) | |
| tree | 55d1a29fd499799220ac79735aa4c54bd82ff24b /lisp/emacs-lisp | |
| parent | 5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315 (diff) | |
| parent | d7995b18e4c7b6ac7b5e31c3c8f5f5db648d3275 (diff) | |
| download | emacs-5693f3de69f9db99252b2f4eb1c7178fdec2a210.tar.gz emacs-5693f3de69f9db99252b2f4eb1c7178fdec2a210.tar.bz2 emacs-5693f3de69f9db99252b2f4eb1c7178fdec2a210.zip | |
merge master
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/eieio-core.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 0297accaa05..261138bfbf8 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -1258,7 +1258,7 @@ method invocation orders of the involved classes." (eieio--class-precedence-list tag)))) -;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "51667b1cd372f45acdae14f838cedcc6") +;;;### (autoloads nil "eieio-compat" "eieio-compat.el" "57805f02023795a01567781e70aaf9f9") ;;; Generated autoloads from eieio-compat.el (autoload 'eieio--defalias "eieio-compat" "\ diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 7672d7f0b6e..3dba8e0e7bf 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -931,7 +931,7 @@ variable PRINT-FUNCTION. Optional argument NOESCAPE is passed to ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "eieio-custom" "eieio-custom.el" "6baa78cfc590cc0422e12b7eb55abf24") +;;;### (autoloads nil "eieio-custom" "eieio-custom.el" "2ec91e473fcad1ff20cd76edc4aab706") ;;; Generated autoloads from eieio-custom.el (autoload 'customize-object "eieio-custom" "\ @@ -942,7 +942,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;*** -;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "e922bf7ebc7dcb272480c4ba148da1ac") +;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "d7b8682e15aebad7dbe6384dc5ed655f") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ |