diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-01-31 22:34:48 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-01-31 22:34:48 -0700 |
| commit | d4d613629b59d2eadd80026cab6c9dabc92cab24 (patch) | |
| tree | d31086a817251dddb847d027661d218c1ecd6540 /lisp/cedet/semantic/sort.el | |
| parent | fdb813e529602914360fc2d0cf22e42e32e6905f (diff) | |
| parent | a5438ee11ad052e71334dcfb2db51fb9123411e5 (diff) | |
| download | emacs-d4d613629b59d2eadd80026cab6c9dabc92cab24.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/cedet/semantic/sort.el')
| -rw-r--r-- | lisp/cedet/semantic/sort.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el index 154a56a27aa..19f46ff7f15 100644 --- a/lisp/cedet/semantic/sort.el +++ b/lisp/cedet/semantic/sort.el @@ -310,11 +310,10 @@ may re-organize the list with side-effects." ;; external members, and bring them together in a cloned copy of the ;; class tag. ;; -(defvar semantic-orphaned-member-metaparent-type "class" +(defvar-local semantic-orphaned-member-metaparent-type "class" "In `semantic-adopt-external-members', the type of 'type for metaparents. A metaparent is a made-up type semantic token used to hold the child list of orphaned members of a named type.") -(make-variable-buffer-local 'semantic-orphaned-member-metaparent-type) (defvar semantic-mark-external-member-function nil "Function called when an externally defined orphan is found. |