2021-04-19 12:21:01 +02:00
|
|
|
|
;;; eieio-custom.el --- eieio object customization -*- lexical-binding:t -*-
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
|
;; Copyright (C) 1999-2001, 2005, 2007-2022 Free Software Foundation,
|
2013-01-01 09:11:05 +00:00
|
|
|
|
;; Inc.
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
2009-10-01 02:47:37 +00:00
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
2013-06-18 16:06:18 -04:00
|
|
|
|
;; Old-Version: 0.2 (using "Version:" made Emacs think this is package
|
|
|
|
|
;; eieio-0.2).
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; Keywords: OO, lisp
|
2010-08-29 12:17:13 -04:00
|
|
|
|
;; Package: eieio
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;
|
|
|
|
|
;; This contains support customization of eieio objects. Enabling
|
2009-10-01 02:47:37 +00:00
|
|
|
|
;; your object to be customizable requires use of the slot attribute
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; `:custom'.
|
|
|
|
|
|
|
|
|
|
(require 'eieio)
|
|
|
|
|
(require 'widget)
|
|
|
|
|
(require 'wid-edit)
|
|
|
|
|
|
|
|
|
|
;;; Compatibility
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
(defclass eieio-widget-test-class nil
|
|
|
|
|
((a-string :initarg :a-string
|
|
|
|
|
:initform "The moose is loose"
|
|
|
|
|
:custom string
|
|
|
|
|
:label "Amorphous String"
|
|
|
|
|
:group (default foo)
|
|
|
|
|
:documentation "A string for testing custom.
|
|
|
|
|
This is the next line of documentation.")
|
|
|
|
|
(listostuff :initarg :listostuff
|
2021-06-12 16:22:03 -04:00
|
|
|
|
:initform '("1" "2" "3")
|
2009-09-28 00:49:54 +00:00
|
|
|
|
:type list
|
|
|
|
|
:custom (repeat (string :tag "Stuff"))
|
|
|
|
|
:label "List of Strings"
|
|
|
|
|
:group foo
|
|
|
|
|
:documentation "A list of stuff.")
|
|
|
|
|
(uninitialized :initarg :uninitialized
|
|
|
|
|
:type string
|
|
|
|
|
:custom string
|
|
|
|
|
:documentation "This slot is not initialized.
|
|
|
|
|
Used to make sure that custom doesn't barf when it encounters one
|
|
|
|
|
of these.")
|
|
|
|
|
(a-number :initarg :a-number
|
|
|
|
|
:initform 2
|
|
|
|
|
:custom integer
|
|
|
|
|
:documentation "A number of thingies."))
|
|
|
|
|
"A class for testing the widget on.")
|
|
|
|
|
|
2014-12-22 22:05:46 -05:00
|
|
|
|
(defcustom eieio-widget-test (eieio-widget-test-class)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Test variable for editing an object."
|
|
|
|
|
:type 'object
|
|
|
|
|
:group 'eieio)
|
|
|
|
|
|
|
|
|
|
(defface eieio-custom-slot-tag-face '((((class color)
|
|
|
|
|
(background dark))
|
|
|
|
|
(:foreground "light blue"))
|
|
|
|
|
(((class color)
|
|
|
|
|
(background light))
|
|
|
|
|
(:foreground "blue"))
|
|
|
|
|
(t (:italic t)))
|
|
|
|
|
"Face used for unpushable variable tags."
|
|
|
|
|
:group 'custom-faces)
|
|
|
|
|
|
|
|
|
|
(defvar eieio-wo nil
|
|
|
|
|
"Buffer local variable in object customize buffers for the current widget.")
|
|
|
|
|
(defvar eieio-co nil
|
|
|
|
|
"Buffer local variable in object customize buffers for the current obj.")
|
|
|
|
|
(defvar eieio-cog nil
|
|
|
|
|
"Buffer local variable in object customize buffers for the current group.")
|
|
|
|
|
|
2009-10-05 15:32:08 +00:00
|
|
|
|
(defvar eieio-custom-ignore-eieio-co nil
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"When true, all customizable slots of the current object are updated.
|
|
|
|
|
Updates occur regardless of the current customization group.")
|
|
|
|
|
|
|
|
|
|
(define-widget 'object-slot 'group
|
|
|
|
|
"Abstractly modify a single slot in an object."
|
|
|
|
|
:tag "Slot"
|
|
|
|
|
:format "%t %v%h\n"
|
|
|
|
|
:convert-widget 'widget-types-convert-widget
|
|
|
|
|
:value-create 'eieio-slot-value-create
|
|
|
|
|
:value-get 'eieio-slot-value-get
|
|
|
|
|
:value-delete 'widget-children-value-delete
|
|
|
|
|
:validate 'widget-children-validate
|
|
|
|
|
:match 'eieio-object-match ;; same
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
(defun eieio-slot-value-create (widget)
|
|
|
|
|
"Create the value of WIDGET."
|
|
|
|
|
(let ((chil nil))
|
|
|
|
|
(setq chil (cons
|
|
|
|
|
(widget-create-child-and-convert
|
|
|
|
|
widget (widget-get widget :childtype)
|
|
|
|
|
:tag ""
|
|
|
|
|
:value (widget-get widget :value))
|
|
|
|
|
chil))
|
|
|
|
|
(widget-put widget :children chil)))
|
|
|
|
|
|
|
|
|
|
(defun eieio-slot-value-get (widget)
|
|
|
|
|
"Get the value of WIDGET."
|
|
|
|
|
(widget-value (car (widget-get widget :children))))
|
|
|
|
|
|
|
|
|
|
(defun eieio-custom-toggle-hide (widget)
|
|
|
|
|
"Toggle visibility of WIDGET."
|
|
|
|
|
(let ((vc (car (widget-get widget :children))))
|
|
|
|
|
(cond ((eq (widget-get vc :eieio-custom-state) 'hidden)
|
|
|
|
|
(widget-put vc :eieio-custom-state 'visible)
|
|
|
|
|
(widget-put vc :value-face (widget-get vc :orig-face)))
|
|
|
|
|
(t
|
|
|
|
|
(widget-put vc :eieio-custom-state 'hidden)
|
|
|
|
|
(widget-put vc :orig-face (widget-get vc :value-face))
|
|
|
|
|
(widget-put vc :value-face 'invisible)
|
|
|
|
|
))
|
|
|
|
|
(widget-value-set vc (widget-value vc))))
|
|
|
|
|
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
(defun eieio-custom-toggle-parent (widget &rest _)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Toggle visibility of parent of WIDGET.
|
|
|
|
|
Optional argument IGNORE is an extraneous parameter."
|
|
|
|
|
(eieio-custom-toggle-hide (widget-get widget :parent)))
|
|
|
|
|
|
|
|
|
|
(define-widget 'object-edit 'group
|
|
|
|
|
"Abstractly modify a CLOS object."
|
|
|
|
|
:tag "Object"
|
|
|
|
|
:format "%v"
|
|
|
|
|
:convert-widget 'widget-types-convert-widget
|
|
|
|
|
:value-create 'eieio-object-value-create
|
|
|
|
|
:value-get 'eieio-object-value-get
|
|
|
|
|
:value-delete 'widget-children-value-delete
|
|
|
|
|
:validate 'widget-children-validate
|
|
|
|
|
:match 'eieio-object-match
|
|
|
|
|
:clone-object-children nil
|
|
|
|
|
)
|
|
|
|
|
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
(defun eieio-object-match (_widget _value)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Match info for WIDGET against VALUE."
|
|
|
|
|
;; Write me
|
|
|
|
|
t)
|
|
|
|
|
|
|
|
|
|
(defun eieio-filter-slot-type (widget slottype)
|
|
|
|
|
"Filter WIDGETs SLOTTYPE."
|
|
|
|
|
(if (widget-get widget :clone-object-children)
|
|
|
|
|
slottype
|
|
|
|
|
(cond ((eq slottype 'object)
|
|
|
|
|
'object-edit)
|
|
|
|
|
((and (listp slottype)
|
|
|
|
|
(eq (car slottype) 'object))
|
|
|
|
|
(cons 'object-edit (cdr slottype)))
|
|
|
|
|
((equal slottype '(repeat object))
|
|
|
|
|
'(repeat object-edit))
|
|
|
|
|
((and (listp slottype)
|
|
|
|
|
(equal (car slottype) 'repeat)
|
|
|
|
|
(listp (car (cdr slottype)))
|
|
|
|
|
(equal (car (car (cdr slottype))) 'object))
|
|
|
|
|
(list 'repeat
|
|
|
|
|
(cons 'object-edit
|
|
|
|
|
(cdr (car (cdr slottype))))))
|
|
|
|
|
(t slottype))))
|
|
|
|
|
|
|
|
|
|
(defun eieio-object-value-create (widget)
|
|
|
|
|
"Create the value of WIDGET."
|
|
|
|
|
(if (not (widget-get widget :value))
|
|
|
|
|
(widget-put widget
|
|
|
|
|
:value (cond ((widget-get widget :objecttype)
|
2015-01-17 09:50:07 -05:00
|
|
|
|
(funcall (eieio--class-constructor
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(widget-get widget :objecttype))
|
|
|
|
|
"Custom-new"))
|
|
|
|
|
((widget-get widget :objectcreatefcn)
|
|
|
|
|
(funcall (widget-get widget :objectcreatefcn)))
|
|
|
|
|
(t (error "No create method specified")))))
|
|
|
|
|
(let* ((chil nil)
|
|
|
|
|
(obj (widget-get widget :value))
|
|
|
|
|
(master-group (widget-get widget :eieio-group))
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(cv (eieio--object-class obj))
|
|
|
|
|
(slots (eieio--class-slots cv)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; First line describes the object, but may not editable.
|
|
|
|
|
(if (widget-get widget :eieio-show-name)
|
|
|
|
|
(setq chil (cons (widget-create-child-and-convert
|
|
|
|
|
widget 'string :tag "Object "
|
|
|
|
|
:sample-face 'bold
|
Cleanup some of EIEIO's namespace.
* lisp/emacs-lisp/eieio.el (eieio--define-field-accessors): New macro.
Use it to define all the class-* and object-* field accessors (renamed
to eieio--class-* and eieio--object-*). Update all uses.
(eieio--class-num-slots, eieio--object-num-slots): Rename from
class-num-slots and object-num-slots.
(eieio--check-type): New macro.
(eieio-defclass, eieio-oref, eieio-oref-default, same-class-p)
(object-of-class-p, child-of-class-p, object-slots, class-slot-initarg)
(eieio-oset, eieio-oset-default, object-assoc, object-assoc-list)
(object-assoc-list-safe): Use it.
(eieio-defclass): Tighten regexp.
(eieio--defmethod): Use `memq'. Signal an error for unknown method kind.
Remove unreachable code.
(object-class-fast): Declare obsolete.
(eieio-class-name, eieio-object-name, eieio-object-set-name-string)
(eieio-object-class, eieio-object-class-name, eieio-class-parents)
(eieio-class-children, eieio-class-precedence-list, eieio-class-parent):
Rename from class-name, object-name, object-set-name-string,
object-class, object-class-name, class-parents, class-children,
class-precedence-list, class-parent; with obsolete alias.
(class-of, class-direct-superclasses, class-direct-subclasses):
Declare obsolete.
(eieio-defmethod): Use `memq'; remove unreachable code.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-opt.el (eieio-class-button, eieio-describe-generic)
(eieio-browse-tree, eieio-browse): Use eieio--check-type.
2013-02-18 21:57:04 -05:00
|
|
|
|
(eieio-object-name-string obj))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
chil)))
|
|
|
|
|
;; Display information about the group being shown
|
|
|
|
|
(when master-group
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(let ((groups (eieio--class-option (eieio--object-class obj)
|
2015-01-04 23:11:37 -05:00
|
|
|
|
:custom-groups)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(widget-insert "Groups:")
|
|
|
|
|
(while groups
|
|
|
|
|
(widget-insert " ")
|
|
|
|
|
(if (eq (car groups) master-group)
|
|
|
|
|
(widget-insert "*" (capitalize (symbol-name master-group)) "*")
|
|
|
|
|
(widget-create 'push-button
|
|
|
|
|
:thing (cons obj (car groups))
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
:notify (lambda (widget &rest _)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(eieio-customize-object
|
|
|
|
|
(car (widget-get widget :thing))
|
|
|
|
|
(cdr (widget-get widget :thing))))
|
|
|
|
|
(capitalize (symbol-name (car groups)))))
|
|
|
|
|
(setq groups (cdr groups)))
|
|
|
|
|
(widget-insert "\n\n")))
|
|
|
|
|
;; Loop over all the slots, creating child widgets.
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(dotimes (i (length slots))
|
|
|
|
|
(let* ((slot (aref slots i))
|
2015-05-05 14:43:48 -04:00
|
|
|
|
(sname (eieio-slot-descriptor-name slot))
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(props (cl--slot-descriptor-props slot)))
|
|
|
|
|
;; Output this slot if it has a customize flag associated with it.
|
|
|
|
|
(when (and (alist-get :custom props)
|
|
|
|
|
(or (not master-group)
|
|
|
|
|
(member master-group (alist-get :group props)))
|
|
|
|
|
(slot-boundp obj (cl--slot-descriptor-name slot)))
|
|
|
|
|
;; In this case, this slot has a custom type. Create its
|
|
|
|
|
;; children widgets.
|
|
|
|
|
(let ((type (eieio-filter-slot-type widget (alist-get :custom props)))
|
|
|
|
|
(stuff nil))
|
|
|
|
|
;; This next bit is an evil hack to get some EDE functions
|
|
|
|
|
;; working the way I like.
|
|
|
|
|
(if (and (listp type)
|
|
|
|
|
(setq stuff (member :slotofchoices type)))
|
|
|
|
|
(let ((choices (eieio-oref obj (car (cdr stuff))))
|
|
|
|
|
(newtype nil))
|
|
|
|
|
(while (not (eq (car type) :slotofchoices))
|
|
|
|
|
(setq newtype (cons (car type) newtype)
|
|
|
|
|
type (cdr type)))
|
|
|
|
|
(while choices
|
|
|
|
|
(setq newtype (cons (list 'const (car choices))
|
|
|
|
|
newtype)
|
|
|
|
|
choices (cdr choices)))
|
|
|
|
|
(setq type (nreverse newtype))))
|
|
|
|
|
(setq chil (cons (widget-create-child-and-convert
|
|
|
|
|
widget 'object-slot
|
|
|
|
|
:childtype type
|
|
|
|
|
:sample-face 'eieio-custom-slot-tag-face
|
|
|
|
|
:tag
|
|
|
|
|
(concat
|
|
|
|
|
(make-string
|
|
|
|
|
(or (widget-get widget :indent) 0)
|
|
|
|
|
?\s)
|
|
|
|
|
(or (alist-get :label props)
|
|
|
|
|
(let ((s (symbol-name
|
|
|
|
|
(or
|
|
|
|
|
(eieio--class-slot-initarg
|
|
|
|
|
(eieio--object-class obj)
|
2015-05-05 14:43:48 -04:00
|
|
|
|
sname)
|
|
|
|
|
sname))))
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(capitalize
|
|
|
|
|
(if (string-match "^:" s)
|
|
|
|
|
(substring s (match-end 0))
|
|
|
|
|
s)))))
|
2015-05-05 14:43:48 -04:00
|
|
|
|
:value (slot-value obj sname)
|
2015-03-18 23:02:26 -04:00
|
|
|
|
:doc (or (alist-get :documentation props)
|
|
|
|
|
"Slot not Documented.")
|
|
|
|
|
:eieio-custom-visibility 'visible
|
|
|
|
|
)
|
|
|
|
|
chil))
|
|
|
|
|
))))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(widget-put widget :children (nreverse chil))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defun eieio-object-value-get (widget)
|
|
|
|
|
"Get the value of WIDGET."
|
|
|
|
|
(let* ((obj (widget-get widget :value))
|
|
|
|
|
(master-group eieio-cog)
|
|
|
|
|
(wids (widget-get widget :children))
|
|
|
|
|
(name (if (widget-get widget :eieio-show-name)
|
|
|
|
|
(car (widget-apply (car wids) :value-inline))
|
|
|
|
|
nil))
|
|
|
|
|
(chil (if (widget-get widget :eieio-show-name)
|
|
|
|
|
(nthcdr 1 wids) wids))
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(cv (eieio--object-class obj))
|
|
|
|
|
(i 0)
|
|
|
|
|
(slots (eieio--class-slots cv)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; If there are any prefix widgets, clear them.
|
|
|
|
|
;; -- None yet
|
|
|
|
|
;; Create a batch of initargs for each slot.
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(while (and (< i (length slots)) chil)
|
|
|
|
|
(let* ((slot (aref slots i))
|
|
|
|
|
(props (cl--slot-descriptor-props slot))
|
|
|
|
|
(cust (alist-get :custom props)))
|
2015-05-05 14:47:58 -04:00
|
|
|
|
;;
|
2015-05-05 12:25:18 -07:00
|
|
|
|
;; Shouldn't I be incremented unconditionally? Or
|
2015-05-05 14:47:58 -04:00
|
|
|
|
;; better shouldn't we simply mapc on the slots vector
|
2015-05-05 12:25:18 -07:00
|
|
|
|
;; avoiding use of this integer variable? PLN Sat May
|
2015-05-05 14:47:58 -04:00
|
|
|
|
;; 2 07:35:45 2015
|
|
|
|
|
;;
|
|
|
|
|
(setq i (+ i 1))
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(if (and cust
|
|
|
|
|
(or eieio-custom-ignore-eieio-co
|
|
|
|
|
(not master-group)
|
|
|
|
|
(member master-group (alist-get :group props)))
|
|
|
|
|
(slot-boundp obj (cl--slot-descriptor-name slot)))
|
|
|
|
|
(progn
|
|
|
|
|
;; Only customized slots have widgets
|
|
|
|
|
(let ((eieio-custom-ignore-eieio-co t))
|
|
|
|
|
(eieio-oset obj (cl--slot-descriptor-name slot)
|
|
|
|
|
(car (widget-apply (car chil) :value-inline))))
|
|
|
|
|
(setq chil (cdr chil))))))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; Set any name updates on it.
|
2019-06-17 13:05:34 +02:00
|
|
|
|
(when name
|
|
|
|
|
(setf (slot-value obj 'object-name) name))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; This is the same object we had before.
|
|
|
|
|
obj))
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-done-customizing ((_obj eieio-default-superclass))
|
2009-10-05 15:32:08 +00:00
|
|
|
|
"When applying change to a widget, call this method.
|
|
|
|
|
This method is called by the default widget-edit commands.
|
|
|
|
|
User made commands should also call this method when applying changes.
|
2009-09-28 00:49:54 +00:00
|
|
|
|
Argument OBJ is the object that has been customized."
|
|
|
|
|
nil)
|
|
|
|
|
|
2011-02-18 00:00:08 -08:00
|
|
|
|
;;;###autoload
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(defun customize-object (obj &optional group)
|
|
|
|
|
"Customize OBJ in a custom buffer.
|
|
|
|
|
Optional argument GROUP is the sub-group of slots to display."
|
|
|
|
|
(eieio-customize-object obj group))
|
|
|
|
|
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(defvar eieio-custom-mode-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(set-keymap-parent map widget-keymap)
|
|
|
|
|
map)
|
2021-09-14 07:55:56 +02:00
|
|
|
|
"Keymap for EIEIO Custom mode.")
|
2012-10-02 02:10:29 +08:00
|
|
|
|
|
|
|
|
|
(define-derived-mode eieio-custom-mode fundamental-mode "EIEIO Custom"
|
|
|
|
|
"Major mode for customizing EIEIO objects.
|
|
|
|
|
\\{eieio-custom-mode-map}")
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-customize-object ((obj eieio-default-superclass)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
&optional group)
|
|
|
|
|
"Customize OBJ in a specialized custom buffer.
|
|
|
|
|
To override call the `eieio-custom-widget-insert' to just insert the
|
|
|
|
|
object widget.
|
|
|
|
|
Optional argument GROUP specifies a subgroup of slots to edit as a symbol.
|
|
|
|
|
These groups are specified with the `:group' slot flag."
|
|
|
|
|
;; Insert check for multiple edits here.
|
|
|
|
|
(let* ((g (or group 'default)))
|
|
|
|
|
(switch-to-buffer (get-buffer-create
|
|
|
|
|
(concat "*CUSTOMIZE "
|
Cleanup some of EIEIO's namespace.
* lisp/emacs-lisp/eieio.el (eieio--define-field-accessors): New macro.
Use it to define all the class-* and object-* field accessors (renamed
to eieio--class-* and eieio--object-*). Update all uses.
(eieio--class-num-slots, eieio--object-num-slots): Rename from
class-num-slots and object-num-slots.
(eieio--check-type): New macro.
(eieio-defclass, eieio-oref, eieio-oref-default, same-class-p)
(object-of-class-p, child-of-class-p, object-slots, class-slot-initarg)
(eieio-oset, eieio-oset-default, object-assoc, object-assoc-list)
(object-assoc-list-safe): Use it.
(eieio-defclass): Tighten regexp.
(eieio--defmethod): Use `memq'. Signal an error for unknown method kind.
Remove unreachable code.
(object-class-fast): Declare obsolete.
(eieio-class-name, eieio-object-name, eieio-object-set-name-string)
(eieio-object-class, eieio-object-class-name, eieio-class-parents)
(eieio-class-children, eieio-class-precedence-list, eieio-class-parent):
Rename from class-name, object-name, object-set-name-string,
object-class, object-class-name, class-parents, class-children,
class-precedence-list, class-parent; with obsolete alias.
(class-of, class-direct-superclasses, class-direct-subclasses):
Declare obsolete.
(eieio-defmethod): Use `memq'; remove unreachable code.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-opt.el (eieio-class-button, eieio-describe-generic)
(eieio-browse-tree, eieio-browse): Use eieio--check-type.
2013-02-18 21:57:04 -05:00
|
|
|
|
(eieio-object-name obj) " "
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(symbol-name g) "*")))
|
2012-07-13 15:06:09 +08:00
|
|
|
|
(setq buffer-read-only nil)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(kill-all-local-variables)
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(eieio-custom-mode)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
(let ((all (overlay-lists)))
|
|
|
|
|
;; Delete all the overlays.
|
|
|
|
|
(mapc 'delete-overlay (car all))
|
|
|
|
|
(mapc 'delete-overlay (cdr all)))
|
|
|
|
|
;; Add an apply reset option at the top of the buffer.
|
|
|
|
|
(eieio-custom-object-apply-reset obj)
|
|
|
|
|
(widget-insert "\n\n")
|
Cleanup some of EIEIO's namespace.
* lisp/emacs-lisp/eieio.el (eieio--define-field-accessors): New macro.
Use it to define all the class-* and object-* field accessors (renamed
to eieio--class-* and eieio--object-*). Update all uses.
(eieio--class-num-slots, eieio--object-num-slots): Rename from
class-num-slots and object-num-slots.
(eieio--check-type): New macro.
(eieio-defclass, eieio-oref, eieio-oref-default, same-class-p)
(object-of-class-p, child-of-class-p, object-slots, class-slot-initarg)
(eieio-oset, eieio-oset-default, object-assoc, object-assoc-list)
(object-assoc-list-safe): Use it.
(eieio-defclass): Tighten regexp.
(eieio--defmethod): Use `memq'. Signal an error for unknown method kind.
Remove unreachable code.
(object-class-fast): Declare obsolete.
(eieio-class-name, eieio-object-name, eieio-object-set-name-string)
(eieio-object-class, eieio-object-class-name, eieio-class-parents)
(eieio-class-children, eieio-class-precedence-list, eieio-class-parent):
Rename from class-name, object-name, object-set-name-string,
object-class, object-class-name, class-parents, class-children,
class-precedence-list, class-parent; with obsolete alias.
(class-of, class-direct-superclasses, class-direct-subclasses):
Declare obsolete.
(eieio-defmethod): Use `memq'; remove unreachable code.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-opt.el (eieio-class-button, eieio-describe-generic)
(eieio-browse-tree, eieio-browse): Use eieio--check-type.
2013-02-18 21:57:04 -05:00
|
|
|
|
(widget-insert "Edit object " (eieio-object-name obj) "\n\n")
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; Create the widget editing the object.
|
2020-12-04 19:12:12 +01:00
|
|
|
|
(setq-local eieio-wo (eieio-custom-widget-insert obj :eieio-group g))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;;Now generate the apply buttons
|
|
|
|
|
(widget-insert "\n")
|
|
|
|
|
(eieio-custom-object-apply-reset obj)
|
|
|
|
|
;; Now initialize the buffer
|
|
|
|
|
(widget-setup)
|
|
|
|
|
;;(widget-minor-mode)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(widget-forward 3)
|
2020-12-04 19:12:12 +01:00
|
|
|
|
(setq-local eieio-co obj)
|
|
|
|
|
(setq-local eieio-cog g)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-custom-object-apply-reset ((_obj eieio-default-superclass))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Insert an Apply and Reset button into the object editor.
|
2009-10-05 15:32:08 +00:00
|
|
|
|
Argument OBJ is the object being customized."
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(widget-create 'push-button
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
:notify (lambda (&rest _)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(widget-apply eieio-wo :value-get)
|
|
|
|
|
(eieio-done-customizing eieio-co)
|
|
|
|
|
(bury-buffer))
|
|
|
|
|
"Accept")
|
|
|
|
|
(widget-insert " ")
|
|
|
|
|
(widget-create 'push-button
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
:notify (lambda (&rest _)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; I think the act of getting it sets
|
2009-10-05 15:32:08 +00:00
|
|
|
|
;; its value through the get function.
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(message "Applying Changes...")
|
|
|
|
|
(widget-apply eieio-wo :value-get)
|
|
|
|
|
(eieio-done-customizing eieio-co)
|
2009-10-05 15:32:08 +00:00
|
|
|
|
(message "Applying Changes...Done"))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Apply")
|
|
|
|
|
(widget-insert " ")
|
|
|
|
|
(widget-create 'push-button
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
:notify (lambda (&rest _)
|
2009-10-05 15:32:08 +00:00
|
|
|
|
(message "Resetting")
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(eieio-customize-object eieio-co eieio-cog))
|
|
|
|
|
"Reset")
|
|
|
|
|
(widget-insert " ")
|
|
|
|
|
(widget-create 'push-button
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
:notify (lambda (&rest _)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(bury-buffer))
|
|
|
|
|
"Cancel"))
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-custom-widget-insert ((obj eieio-default-superclass)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
&rest flags)
|
|
|
|
|
"Insert the widget used for editing object OBJ in the current buffer.
|
|
|
|
|
Arguments FLAGS are widget compatible flags.
|
|
|
|
|
Must return the created widget."
|
|
|
|
|
(apply 'widget-create 'object-edit :value obj flags))
|
|
|
|
|
|
|
|
|
|
(define-widget 'object 'object-edit
|
|
|
|
|
"Instance of a CLOS class."
|
|
|
|
|
:format "%{%t%}:\n%v"
|
|
|
|
|
:value-to-internal 'eieio-object-value-to-abstract
|
|
|
|
|
:value-to-external 'eieio-object-abstract-to-value
|
|
|
|
|
:clone-object-children t
|
|
|
|
|
)
|
|
|
|
|
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
(defun eieio-object-value-to-abstract (_widget value)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"For WIDGET, convert VALUE to an abstract /safe/ representation."
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
(if (eieio-object-p value) value))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
* lisp/emacs-lisp/eieio*.el: Use hashtables rather than obarrays
* lisp/emacs-lisp/eieio-core.el (class): Rename field symbol-obarray to
symbol-hashtable. It contains a hashtable instead of an obarray.
(generic-p): Use symbol property `eieio-method-hashtable' instead of
`eieio-method-obarray'.
(generic-primary-only-p, generic-primary-only-one-p):
Slight optimization.
(eieio-defclass-autoload-map): Use a hashtable instead of an obarray.
(eieio-defclass-autoload, eieio-defclass): Adjust/simplify accordingly.
(eieio-class-un-autoload): Use autoload-do-load.
(eieio-defclass): Use dolist, cl-pushnew, cl-callf.
Use new cl-deftype-satisfies. Adjust to use of hashtables.
Don't hardcode the value of eieio--object-num-slots.
(eieio-defgeneric-form-primary-only-one): Remove `doc-string' arg.
Use a closure rather than a backquoted lambda.
(eieio--defmethod): Adjust call accordingly. Set doc-string via the
function-documentation property.
(eieio-slot-originating-class-p, eieio-slot-name-index)
(eieiomt--optimizing-hashtable, eieiomt-install, eieiomt-add)
(eieio-generic-form): Adjust to use of hashtables.
(eieiomt--sym-optimize): Rename from eieiomt-sym-optimize; take
additional class argument.
(eieio-generic-call-methodname): Remove, unused.
* lisp/emacs-lisp/eieio-custom.el: Use lexical-binding.
(eieio-object-value-to-abstract): Simplify.
* lisp/emacs-lisp/eieio-datadebug.el: Use lexical-binding.
* lisp/emacs-lisp/eieio-opt.el (eieio-build-class-list): Use cl-mapcan.
(eieio-build-class-alist): Use dolist.
(eieio-all-generic-functions): Adjust to use of hashtables.
* lisp/emacs-lisp/eieio.el (child-of-class-p): Fix case where `class' is
`eieio-default-superclass'.
* test/automated/eieio-test-methodinvoke.el (eieio-test-method-store):
Remove use of eieio-generic-call-methodname.
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Adjust the expected result accordingly.
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-slot-type-is-class-p):
Prefer \' to $.
2014-12-22 15:13:02 -05:00
|
|
|
|
(defun eieio-object-abstract-to-value (_widget value)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"For WIDGET, convert VALUE from an abstract /safe/ representation."
|
|
|
|
|
value)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; customization group functions
|
|
|
|
|
;;
|
|
|
|
|
;; These functions provide the ability to create dynamic menus to
|
|
|
|
|
;; customize specific sections of an object. They do not hook directly
|
|
|
|
|
;; into a filter, but can be used to create easymenu vectors.
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-customize-object-group ((obj eieio-default-superclass))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Create a list of vectors for customizing sections of OBJ."
|
|
|
|
|
(mapcar (lambda (group)
|
|
|
|
|
(vector (concat "Group " (symbol-name group))
|
|
|
|
|
(list 'customize-object obj (list 'quote group))
|
|
|
|
|
t))
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(eieio--class-option (eieio--object-class obj) :custom-groups)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
|
|
|
|
(defvar eieio-read-custom-group-history nil
|
|
|
|
|
"History for the custom group reader.")
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-read-customization-group ((obj eieio-default-superclass))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Do a completing read on the name of a customization group in OBJ.
|
lisp/*.el: Fix typos and other trivial doc fixes
* lisp/allout-widgets.el (allout-widgets-auto-activation)
(allout-current-decorated-p):
* lisp/auth-source.el (auth-source-protocols):
* lisp/autorevert.el (auto-revert-set-timer):
* lisp/battery.el (battery-mode-line-limit):
* lisp/calc/calcalg3.el (math-map-binop):
* lisp/calendar/cal-dst.el (calendar-dst-find-startend):
* lisp/calendar/cal-mayan.el (calendar-mayan-long-count-to-absolute):
* lisp/calendar/calendar.el (calendar-date-echo-text)
(calendar-generate-month, calendar-string-spread)
(calendar-cursor-to-date, calendar-read, calendar-read-date)
(calendar-mark-visible-date, calendar-dayname-on-or-before):
* lisp/calendar/diary-lib.el (diary-ordinal-suffix):
* lisp/cedet/ede/autoconf-edit.el (autoconf-new-program)
(autoconf-find-last-macro, autoconf-parameter-strip):
* lisp/cedet/ede/config.el (ede-target-with-config-build):
* lisp/cedet/ede/linux.el (ede-linux--detect-architecture)
(ede-linux--get-architecture):
* lisp/cedet/semantic/complete.el (semantic-collector-calculate-cache)
(semantic-displayer-abstract, semantic-displayer-point-position):
* lisp/cedet/semantic/format.el (semantic-format-face-alist)
(semantic-format-tag-short-doc):
* lisp/cedet/semantic/fw.el (semantic-find-file-noselect):
* lisp/cedet/semantic/idle.el (semantic-idle-scheduler-work-idle-time)
(semantic-idle-breadcrumbs-display-function)
(semantic-idle-breadcrumbs-format-tag-list-function):
* lisp/cedet/semantic/lex.el (semantic-lex-map-types)
(define-lex, define-lex-block-type-analyzer):
* lisp/cedet/semantic/senator.el (senator-search-default-tag-filter):
* lisp/cedet/semantic/symref.el (semantic-symref-result)
(semantic-symref-hit-to-tag-via-db):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-new-variable)
(semantic-tag-new-include, semantic-tag-new-package)
(semantic-tag-set-faux, semantic-create-tag-proxy)
(semantic-tag-function-parent)
(semantic-tag-components-with-overlays):
* lisp/cedet/srecode/cpp.el (srecode-cpp-namespaces)
(srecode-semantic-handle-:c, srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (srecode-create-dictionary)
(srecode-dictionary-add-entries, srecode-dictionary-lookup-name)
(srecode-create-dictionaries-from-tags):
* lisp/cmuscheme.el (scheme-compile-region):
* lisp/color.el (color-lab-to-lch):
* lisp/doc-view.el (doc-view-image-width)
(doc-view-set-up-single-converter):
* lisp/dynamic-setting.el (font-setting-change-default-font)
(dynamic-setting-handle-config-changed-event):
* lisp/elec-pair.el (electric-pair-text-pairs)
(electric-pair-skip-whitespace-function)
(electric-pair-string-bound-function):
* lisp/emacs-lisp/avl-tree.el (avl-tree--del-balance)
(avl-tree-member, avl-tree-mapcar, avl-tree-iter):
* lisp/emacs-lisp/bytecomp.el (byte-compile-generate-call-tree):
* lisp/emacs-lisp/checkdoc.el (checkdoc-autofix-flag)
(checkdoc-spellcheck-documentation-flag, checkdoc-ispell)
(checkdoc-ispell-current-buffer, checkdoc-ispell-interactive)
(checkdoc-ispell-message-interactive)
(checkdoc-ispell-message-text, checkdoc-ispell-start)
(checkdoc-ispell-continue, checkdoc-ispell-comments)
(checkdoc-ispell-defun):
* lisp/emacs-lisp/cl-generic.el (cl--generic-search-method):
* lisp/emacs-lisp/eieio-custom.el (eieio-read-customization-group):
* lisp/emacs-lisp/lisp.el (forward-sexp, up-list):
* lisp/emacs-lisp/package-x.el (package--archive-contents-from-file):
* lisp/emacs-lisp/package.el (package-desc)
(package--make-autoloads-and-stuff, package-hidden-regexps):
* lisp/emacs-lisp/tcover-ses.el (ses-exercise-startup):
* lisp/emacs-lisp/testcover.el (testcover-nohits)
(testcover-1value):
* lisp/epg.el (epg-receive-keys, epg-start-edit-key):
* lisp/erc/erc-backend.el (erc-server-processing-p)
(erc-split-line-length, erc-server-coding-system)
(erc-server-send, erc-message):
* lisp/erc/erc-button.el (erc-button-face, erc-button-alist)
(erc-browse-emacswiki):
* lisp/erc/erc-ezbounce.el (erc-ezbounce, erc-ezb-get-login):
* lisp/erc/erc-fill.el (erc-fill-variable-maximum-indentation):
* lisp/erc/erc-log.el (erc-current-logfile):
* lisp/erc/erc-match.el (erc-log-match-format)
(erc-text-matched-hook):
* lisp/erc/erc-netsplit.el (erc-netsplit, erc-netsplit-debug):
* lisp/erc/erc-networks.el (erc-server-alist)
(erc-networks-alist, erc-current-network):
* lisp/erc/erc-ring.el (erc-input-ring-index):
* lisp/erc/erc-speedbar.el (erc-speedbar)
(erc-speedbar-update-channel):
* lisp/erc/erc-stamp.el (erc-timestamp-only-if-changed-flag):
* lisp/erc/erc-track.el (erc-track-position-in-mode-line)
(erc-track-remove-from-mode-line, erc-modified-channels-update)
(erc-track-last-non-erc-buffer, erc-track-sort-by-importance)
(erc-track-get-active-buffer):
* lisp/erc/erc.el (erc-get-channel-user-list)
(erc-echo-notice-hook, erc-echo-notice-always-hook)
(erc-wash-quit-reason, erc-format-@nick):
* lisp/ffap.el (ffap-latex-mode):
* lisp/files.el (abort-if-file-too-large)
(dir-locals--get-sort-score, buffer-stale--default-function):
* lisp/filesets.el (filesets-tree-max-level, filesets-data)
(filesets-update-pre010505):
* lisp/gnus/gnus-agent.el (gnus-agent-flush-cache):
* lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol)
(gnus-button-prefer-mid-or-mail):
* lisp/gnus/gnus-cus.el (gnus-group-parameters):
* lisp/gnus/gnus-demon.el (gnus-demon-handlers)
(gnus-demon-run-callback):
* lisp/gnus/gnus-dired.el (gnus-dired-print):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-buffer):
* lisp/gnus/gnus-range.el (gnus-range-normalize):
* lisp/gnus/gnus-spec.el (gnus-pad-form):
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
(gnus-server-opened, gnus-server-closed, gnus-server-denied)
(gnus-server-offline):
* lisp/gnus/gnus-sum.el (gnus-refer-thread-use-nnir)
(gnus-refer-thread-limit-to-thread)
(gnus-summary-limit-include-thread, gnus-summary-refer-thread)
(gnus-summary-find-matching):
* lisp/gnus/gnus-util.el (gnus-rescale-image):
* lisp/gnus/gnus.el (gnus-summary-line-format, gnus-no-server):
* lisp/gnus/mail-source.el (mail-source-incoming-file-prefix):
* lisp/gnus/message.el (message-cite-reply-position)
(message-cite-style-outlook, message-cite-style-thunderbird)
(message-cite-style-gmail, message--send-mail-maybe-partially):
* lisp/gnus/mm-extern.el (mm-inline-external-body):
* lisp/gnus/mm-partial.el (mm-inline-partial):
* lisp/gnus/mml-sec.el (mml-secure-message-sign)
(mml-secure-message-sign-encrypt, mml-secure-message-encrypt):
* lisp/gnus/mml2015.el (mml2015-epg-key-image)
(mml2015-epg-key-image-to-string):
* lisp/gnus/nndiary.el (nndiary-reminders, nndiary-get-new-mail):
* lisp/gnus/nnheader.el (nnheader-directory-files-is-safe):
* lisp/gnus/nnir.el (nnir-search-history)
(nnir-imap-search-other, nnir-artlist-length)
(nnir-artlist-article, nnir-artitem-group, nnir-artitem-number)
(nnir-artitem-rsv, nnir-article-group, nnir-article-number)
(nnir-article-rsv, nnir-article-ids, nnir-categorize)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-hyrex-additional-switches)
(gnus-group-make-nnir-group, nnir-run-namazu, nnir-read-parms)
(nnir-read-parm, nnir-read-server-parm, nnir-search-thread):
* lisp/gnus/nnmairix.el (nnmairix-default-group)
(nnmairix-propagate-marks):
* lisp/gnus/smime.el (smime-keys, smime-crl-check)
(smime-verify-buffer, smime-noverify-buffer):
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url):
* lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header)
(spam-spamassassin-spam-status-header, spam-sa-learn-rebuild)
(spam-classifications, spam-check-stat, spam-spamassassin-score):
* lisp/help.el (describe-minor-mode-from-symbol):
* lisp/hippie-exp.el (hippie-expand-ignore-buffers):
* lisp/htmlfontify.el (hfy-optimizations, hfy-face-resolve-face)
(hfy-begin-span):
* lisp/ibuf-ext.el (ibuffer-update-saved-filters-format)
(ibuffer-saved-filters, ibuffer-old-saved-filters-warning)
(ibuffer-filtering-qualifiers, ibuffer-repair-saved-filters)
(eval, ibuffer-unary-operand, file-extension, directory):
* lisp/image-dired.el (image-dired-cmd-pngcrush-options):
* lisp/image-mode.el (image-toggle-display):
* lisp/international/ccl.el (ccl-compile-read-multibyte-character)
(ccl-compile-write-multibyte-character):
* lisp/international/kkc.el (kkc-save-init-file):
* lisp/international/latin1-disp.el (latin1-display):
* lisp/international/ogonek.el (ogonek-name-encoding-alist)
(ogonek-information, ogonek-lookup-encoding)
(ogonek-deprefixify-region):
* lisp/isearch.el (isearch-filter-predicate)
(isearch--momentary-message):
* lisp/jsonrpc.el (jsonrpc-connection-send)
(jsonrpc-process-connection, jsonrpc-shutdown)
(jsonrpc--async-request-1):
* lisp/language/tibet-util.el (tibetan-char-p):
* lisp/mail/feedmail.el (feedmail-queue-use-send-time-for-date)
(feedmail-last-chance-hook, feedmail-before-fcc-hook)
(feedmail-send-it-immediately-wrapper, feedmail-find-eoh):
* lisp/mail/hashcash.el (hashcash-generate-payment)
(hashcash-generate-payment-async, hashcash-insert-payment)
(hashcash-verify-payment):
* lisp/mail/rmail.el (rmail-movemail-variant-in-use)
(rmail-get-attr-value):
* lisp/mail/rmailmm.el (rmail-mime-prefer-html, rmail-mime):
* lisp/mail/rmailsum.el (rmail-summary-show-message):
* lisp/mail/supercite.el (sc-raw-mode-toggle):
* lisp/man.el (Man-start-calling):
* lisp/mh-e/mh-acros.el (mh-do-at-event-location)
(mh-iterate-on-messages-in-region, mh-iterate-on-range):
* lisp/mh-e/mh-alias.el (mh-alias-system-aliases)
(mh-alias-reload, mh-alias-ali)
(mh-alias-canonicalize-suggestion, mh-alias-add-alias-to-file)
(mh-alias-add-alias):
* lisp/mouse.el (mouse-save-then-kill):
* lisp/net/browse-url.el (browse-url-default-macosx-browser):
* lisp/net/eudc.el (eudc-set, eudc-variable-protocol-value)
(eudc-variable-server-value, eudc-update-variable)
(eudc-expand-inline):
* lisp/net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result):
* lisp/net/eudcb-ldap.el (eudc-ldap-get-field-list):
* lisp/net/pop3.el (pop3-list):
* lisp/net/soap-client.el (soap-namespace-put)
(soap-xs-parse-sequence, soap-parse-envelope):
* lisp/net/soap-inspect.el (soap-inspect-xs-complex-type):
* lisp/nxml/rng-xsd.el (rng-xsd-date-to-days):
* lisp/org/ob-C.el (org-babel-prep-session:C)
(org-babel-load-session:C):
* lisp/org/ob-J.el (org-babel-execute:J):
* lisp/org/ob-asymptote.el (org-babel-prep-session:asymptote):
* lisp/org/ob-awk.el (org-babel-execute:awk):
* lisp/org/ob-core.el (org-babel-process-file-name):
* lisp/org/ob-ebnf.el (org-babel-execute:ebnf):
* lisp/org/ob-forth.el (org-babel-execute:forth):
* lisp/org/ob-fortran.el (org-babel-execute:fortran)
(org-babel-prep-session:fortran, org-babel-load-session:fortran):
* lisp/org/ob-groovy.el (org-babel-execute:groovy):
* lisp/org/ob-io.el (org-babel-execute:io):
* lisp/org/ob-js.el (org-babel-execute:js):
* lisp/org/ob-lilypond.el (org-babel-default-header-args:lilypond)
(org-babel-lilypond-compile-post-tangle)
(org-babel-lilypond-display-pdf-post-tangle)
(org-babel-lilypond-tangle)
(org-babel-lilypond-execute-tangled-ly)
(org-babel-lilypond-compile-lilyfile)
(org-babel-lilypond-check-for-compile-error)
(org-babel-lilypond-process-compile-error)
(org-babel-lilypond-mark-error-line)
(org-babel-lilypond-parse-error-line)
(org-babel-lilypond-attempt-to-open-pdf)
(org-babel-lilypond-attempt-to-play-midi)
(org-babel-lilypond-switch-extension)
(org-babel-lilypond-set-header-args):
* lisp/org/ob-lua.el (org-babel-prep-session:lua):
* lisp/org/ob-picolisp.el (org-babel-execute:picolisp):
* lisp/org/ob-processing.el (org-babel-prep-session:processing):
* lisp/org/ob-python.el (org-babel-prep-session:python):
* lisp/org/ob-scheme.el (org-babel-scheme-capture-current-message)
(org-babel-scheme-execute-with-geiser, org-babel-execute:scheme):
* lisp/org/ob-shen.el (org-babel-execute:shen):
* lisp/org/org-agenda.el (org-agenda-entry-types)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-time-grid, org-agenda-sorting-strategy)
(org-agenda-filter-by-category, org-agenda-forward-block):
* lisp/org/org-colview.el (org-columns--overlay-text):
* lisp/org/org-faces.el (org-verbatim, org-cycle-level-faces):
* lisp/org/org-indent.el (org-indent-set-line-properties):
* lisp/org/org-macs.el (org-get-limited-outline-regexp):
* lisp/org/org-mobile.el (org-mobile-files):
* lisp/org/org.el (org-use-fast-todo-selection)
(org-extend-today-until, org-use-property-inheritance)
(org-refresh-effort-properties, org-open-at-point-global)
(org-track-ordered-property-with-tag, org-shiftright):
* lisp/org/ox-html.el (org-html-checkbox-type):
* lisp/org/ox-man.el (org-man-source-highlight)
(org-man-verse-block):
* lisp/org/ox-publish.el (org-publish-sitemap-default):
* lisp/outline.el (outline-head-from-level):
* lisp/progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-calc-command-indent, dcl-indent-to):
* lisp/progmodes/flymake.el (flymake-make-diagnostic)
(flymake--overlays, flymake-diagnostic-functions)
(flymake-diagnostic-types-alist, flymake--backend-state)
(flymake-is-running, flymake--collect, flymake-mode):
* lisp/progmodes/gdb-mi.el (gdb-threads-list, gdb, gdb-non-stop)
(gdb-buffers, gdb-gud-context-call, gdb-jsonify-buffer):
* lisp/progmodes/grep.el (grep-error-screen-columns):
* lisp/progmodes/gud.el (gud-prev-expr):
* lisp/progmodes/ps-mode.el (ps-mode, ps-mode-target-column)
(ps-run-goto-error):
* lisp/progmodes/python.el (python-eldoc-get-doc)
(python-eldoc-function-timeout-permanent, python-eldoc-function):
* lisp/shadowfile.el (shadow-make-group):
* lisp/speedbar.el (speedbar-obj-do-check):
* lisp/textmodes/flyspell.el (flyspell-auto-correct-previous-hook):
* lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib):
* lisp/textmodes/reftex-index.el (reftex-index-goto-entry)
(reftex-index-kill, reftex-index-undo):
* lisp/textmodes/reftex-parse.el (reftex-context-substring):
* lisp/textmodes/reftex.el (reftex-TeX-master-file):
* lisp/textmodes/rst.el (rst-next-hdr, rst-toc)
(rst-uncomment-region, rst-font-lock-extend-region-internal):
* lisp/thumbs.el (thumbs-mode):
* lisp/vc/ediff-util.el (ediff-restore-diff):
* lisp/vc/pcvs-defs.el (cvs-cvsroot, cvs-force-dir-tag):
* lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p):
* lisp/wid-edit.el (widget-field-value-set, string):
* lisp/x-dnd.el (x-dnd-version-from-flags)
(x-dnd-more-than-3-from-flags): Assorted docfixes.
2019-09-21 00:27:53 +02:00
|
|
|
|
Return the symbol for the group, or nil."
|
2015-03-18 23:02:26 -04:00
|
|
|
|
(let ((g (eieio--class-option (eieio--object-class obj)
|
2015-01-04 23:11:37 -05:00
|
|
|
|
:custom-groups)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(if (= (length g) 1)
|
|
|
|
|
(car g)
|
|
|
|
|
;; Make the association list
|
|
|
|
|
(setq g (mapcar (lambda (g) (cons (symbol-name g) g)) g))
|
|
|
|
|
(cdr (assoc
|
2019-06-16 15:53:03 +02:00
|
|
|
|
(completing-read
|
|
|
|
|
(concat
|
|
|
|
|
(if (slot-exists-p obj 'name)
|
|
|
|
|
(concat (slot-value obj (intern "name" obarray)) "")
|
|
|
|
|
"")
|
|
|
|
|
"Custom Group: ")
|
|
|
|
|
g nil t nil 'eieio-read-custom-group-history)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
g)))))
|
|
|
|
|
|
|
|
|
|
(provide 'eieio-custom)
|
|
|
|
|
|
2014-01-09 21:31:21 +01:00
|
|
|
|
;; Local variables:
|
2015-12-17 20:01:16 +00:00
|
|
|
|
;; generated-autoload-file: "eieio-loaddefs.el"
|
2014-01-09 21:31:21 +01:00
|
|
|
|
;; End:
|
|
|
|
|
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;;; eieio-custom.el ends here
|