summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/eieio.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-02-01 19:38:21 -0800
committerGlenn Morris <rgm@gnu.org>2013-02-01 19:38:21 -0800
commit94fbc901707d7c1fd7ec0471d288e585caf59b34 (patch)
tree6d1d48970b231f2ccd2f7c36e4c7298302c00e93 /lisp/emacs-lisp/eieio.el
parent98da8c0f542465341b930d36db8000b5bb2c77c4 (diff)
parent13841bfcc20881a268e3c853f65312390c589700 (diff)
downloademacs-94fbc901707d7c1fd7ec0471d288e585caf59b34.tar.gz
Merge from emacs-24; up to 2012-12-13T09:45:54Z!lekktu@gmail.com
Diffstat (limited to 'lisp/emacs-lisp/eieio.el')
-rw-r--r--lisp/emacs-lisp/eieio.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 7a22e1222c9..626bc0f6dc6 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -4,7 +4,7 @@
;; Copyright (C) 1995-1996, 1998-2013 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 1.3
+;; Version: 1.4
;; Keywords: OO, lisp
;; This file is part of GNU Emacs.
@@ -46,7 +46,7 @@
(eval-when-compile (require 'cl)) ;FIXME: Use cl-lib!
-(defvar eieio-version "1.3"
+(defvar eieio-version "1.4"
"Current version of EIEIO.")
(defun eieio-version ()