diff options
| author | Glenn Morris | 2018-03-16 20:34:27 -0400 |
|---|---|---|
| committer | Glenn Morris | 2018-03-16 20:34:27 -0400 |
| commit | 9c4ee531158960d3aae50e950b48ca8dce18c0d1 (patch) | |
| tree | 6f63477b6532628024ec4e75b3cda87c549590d6 /lisp/cedet/semantic | |
| parent | 165803c69136229aaf426bf7655eacbe94425138 (diff) | |
| download | emacs-9c4ee531158960d3aae50e950b48ca8dce18c0d1.tar.gz emacs-9c4ee531158960d3aae50e950b48ca8dce18c0d1.zip | |
cedet: remove obsolete name args to constructors
* lisp/cedet/ede/proj-archive.el, lisp/cedet/ede/proj-aux.el:
* lisp/cedet/ede/proj-elisp.el, lisp/cedet/ede/proj-info.el:
* lisp/cedet/ede/proj-misc.el, lisp/cedet/ede/proj-obj.el:
* lisp/cedet/ede/proj-shared.el, lisp/cedet/ede/simple.el:
* lisp/cedet/ede/source.el, lisp/cedet/semantic/:
* lisp/cedet/semantic/analyze.el, lisp/cedet/semantic/complete.el:
* lisp/cedet/semantic/db-javascript.el:
* lisp/cedet/semantic/db-ref.el, lisp/cedet/semantic/debug.el:
* lisp/cedet/semantic/ede-grammar.el:
* lisp/cedet/semantic/mru-bookmark.el, lisp/cedet/semantic/scope.el:
* lisp/cedet/semantic/texi.el, lisp/cedet/semantic/bovine/:
* lisp/cedet/semantic/bovine/c.el:
* lisp/cedet/semantic/bovine/debug.el, lisp/cedet/srecode/:
* lisp/cedet/srecode/extract.el, lisp/cedet/srecode/map.el:
* lisp/cedet/srecode/srt-mode.el:
Remove obsolete name args to constructors.
Diffstat (limited to 'lisp/cedet/semantic')
| -rw-r--r-- | lisp/cedet/semantic/analyze.el | 3 | ||||
| -rw-r--r-- | lisp/cedet/semantic/bovine/c.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/bovine/debug.el | 6 | ||||
| -rw-r--r-- | lisp/cedet/semantic/complete.el | 24 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-javascript.el | 6 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-ref.el | 3 | ||||
| -rw-r--r-- | lisp/cedet/semantic/debug.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/semantic/ede-grammar.el | 10 | ||||
| -rw-r--r-- | lisp/cedet/semantic/mru-bookmark.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/semantic/scope.el | 6 | ||||
| -rw-r--r-- | lisp/cedet/semantic/texi.el | 1 |
11 files changed, 22 insertions, 41 deletions
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index 7c9f102951d..625982f2c76 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el | |||
| @@ -642,7 +642,6 @@ Returns an object based on symbol `semantic-analyze-context'." | |||
| 642 | ;; for the argument. | 642 | ;; for the argument. |
| 643 | (setq context-return | 643 | (setq context-return |
| 644 | (semantic-analyze-context-functionarg | 644 | (semantic-analyze-context-functionarg |
| 645 | "functionargument" | ||
| 646 | :buffer (current-buffer) | 645 | :buffer (current-buffer) |
| 647 | :function fntag | 646 | :function fntag |
| 648 | :index arg | 647 | :index arg |
| @@ -665,7 +664,6 @@ Returns an object based on symbol `semantic-analyze-context'." | |||
| 665 | 664 | ||
| 666 | (setq context-return | 665 | (setq context-return |
| 667 | (semantic-analyze-context-assignment | 666 | (semantic-analyze-context-assignment |
| 668 | "assignment" | ||
| 669 | :buffer (current-buffer) | 667 | :buffer (current-buffer) |
| 670 | :assignee asstag | 668 | :assignee asstag |
| 671 | :scope scope | 669 | :scope scope |
| @@ -683,7 +681,6 @@ Returns an object based on symbol `semantic-analyze-context'." | |||
| 683 | ;; Nothing in particular | 681 | ;; Nothing in particular |
| 684 | (setq context-return | 682 | (setq context-return |
| 685 | (semantic-analyze-context | 683 | (semantic-analyze-context |
| 686 | "context" | ||
| 687 | :buffer (current-buffer) | 684 | :buffer (current-buffer) |
| 688 | :scope scope | 685 | :scope scope |
| 689 | :bounds bounds | 686 | :bounds bounds |
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 73c8a56dbd8..cb27582fa54 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el | |||
| @@ -1990,7 +1990,7 @@ have to be wrapped in that namespace." | |||
| 1990 | (list (semantic-tag-new-type inside-ns "namespace" tags nil))) | 1990 | (list (semantic-tag-new-type inside-ns "namespace" tags nil))) |
| 1991 | ;; Create new semantic-table for the wrapped tags, since we don't want | 1991 | ;; Create new semantic-table for the wrapped tags, since we don't want |
| 1992 | ;; the namespace to actually be a part of the header file. | 1992 | ;; the namespace to actually be a part of the header file. |
| 1993 | (setq newtable (semanticdb-table "include with context")) | 1993 | (setq newtable (semanticdb-table)) |
| 1994 | (oset newtable tags newtags) | 1994 | (oset newtable tags newtags) |
| 1995 | (oset newtable parent-db (oref inctable parent-db)) | 1995 | (oset newtable parent-db (oref inctable parent-db)) |
| 1996 | (oset newtable file (oref inctable file))) | 1996 | (oset newtable file (oref inctable file))) |
diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el index 9bacee2a9cc..e511b3d2710 100644 --- a/lisp/cedet/semantic/bovine/debug.el +++ b/lisp/cedet/semantic/bovine/debug.el | |||
| @@ -73,8 +73,7 @@ The RULE is for \"thing\" is 1. | |||
| 73 | The MATCH for \"thing\" is 1. | 73 | The MATCH for \"thing\" is 1. |
| 74 | COLLECTION is a list of `things' that have been matched so far. | 74 | COLLECTION is a list of `things' that have been matched so far. |
| 75 | LEXTOKEN, is a token returned by the lexer which is being matched." | 75 | LEXTOKEN, is a token returned by the lexer which is being matched." |
| 76 | (let ((frame (semantic-bovine-debug-frame "frame" | 76 | (let ((frame (semantic-bovine-debug-frame :nonterm nonterm |
| 77 | :nonterm nonterm | ||
| 78 | :rule rule | 77 | :rule rule |
| 79 | :match match | 78 | :match match |
| 80 | :collection collection | 79 | :collection collection |
| @@ -119,8 +118,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched." | |||
| 119 | (defun semantic-create-bovine-debug-error-frame (condition) | 118 | (defun semantic-create-bovine-debug-error-frame (condition) |
| 120 | "Create an error frame for bovine debugger. | 119 | "Create an error frame for bovine debugger. |
| 121 | Argument CONDITION is the thrown error condition." | 120 | Argument CONDITION is the thrown error condition." |
| 122 | (let ((frame (semantic-bovine-debug-error-frame "frame" | 121 | (let ((frame (semantic-bovine-debug-error-frame :condition condition))) |
| 123 | :condition condition))) | ||
| 124 | (semantic-debug-set-frame semantic-debug-current-interface | 122 | (semantic-debug-set-frame semantic-debug-current-interface |
| 125 | frame) | 123 | frame) |
| 126 | frame)) | 124 | frame)) |
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 1da1a319f11..baea2261e5d 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el | |||
| @@ -1890,8 +1890,8 @@ If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. | |||
| 1890 | HISTORY is a symbol representing a variable to store the history in." | 1890 | HISTORY is a symbol representing a variable to store the history in." |
| 1891 | (semantic-complete-read-tag-engine | 1891 | (semantic-complete-read-tag-engine |
| 1892 | (semantic-collector-buffer-deep prompt :buffer (current-buffer)) | 1892 | (semantic-collector-buffer-deep prompt :buffer (current-buffer)) |
| 1893 | (semantic-displayor-traditional-with-focus-highlight "simple") | 1893 | (semantic-displayor-traditional-with-focus-highlight) |
| 1894 | ;;(semantic-displayor-tooltip "simple") | 1894 | ;;(semantic-displayor-tooltip) |
| 1895 | prompt | 1895 | prompt |
| 1896 | default-tag | 1896 | default-tag |
| 1897 | initial-input | 1897 | initial-input |
| @@ -1912,8 +1912,8 @@ If INITIAL-INPUT is non-nil, insert it in the minibuffer initially. | |||
| 1912 | HISTORY is a symbol representing a variable to store the history in." | 1912 | HISTORY is a symbol representing a variable to store the history in." |
| 1913 | (semantic-complete-read-tag-engine | 1913 | (semantic-complete-read-tag-engine |
| 1914 | (semantic-collector-local-members prompt :buffer (current-buffer)) | 1914 | (semantic-collector-local-members prompt :buffer (current-buffer)) |
| 1915 | (semantic-displayor-traditional-with-focus-highlight "simple") | 1915 | (semantic-displayor-traditional-with-focus-highlight) |
| 1916 | ;;(semantic-displayor-tooltip "simple") | 1916 | ;;(semantic-displayor-tooltip) |
| 1917 | prompt | 1917 | prompt |
| 1918 | default-tag | 1918 | default-tag |
| 1919 | initial-input | 1919 | initial-input |
| @@ -1937,7 +1937,7 @@ HISTORY is a symbol representing a variable to store the history in." | |||
| 1937 | :buffer (current-buffer) | 1937 | :buffer (current-buffer) |
| 1938 | :path (current-buffer) | 1938 | :path (current-buffer) |
| 1939 | ) | 1939 | ) |
| 1940 | (semantic-displayor-traditional-with-focus-highlight "simple") | 1940 | (semantic-displayor-traditional-with-focus-highlight) |
| 1941 | prompt | 1941 | prompt |
| 1942 | default-tag | 1942 | default-tag |
| 1943 | initial-input | 1943 | initial-input |
| @@ -1954,7 +1954,6 @@ to control how completion options are displayed. | |||
| 1954 | See `semantic-complete-inline-tag-engine' for details on how | 1954 | See `semantic-complete-inline-tag-engine' for details on how |
| 1955 | completion works." | 1955 | completion works." |
| 1956 | (let* ((collector (semantic-collector-project-brutish | 1956 | (let* ((collector (semantic-collector-project-brutish |
| 1957 | "inline" | ||
| 1958 | :buffer (current-buffer) | 1957 | :buffer (current-buffer) |
| 1959 | :path (current-buffer))) | 1958 | :path (current-buffer))) |
| 1960 | (sbounds (semantic-ctxt-current-symbol-and-bounds)) | 1959 | (sbounds (semantic-ctxt-current-symbol-and-bounds)) |
| @@ -1984,9 +1983,8 @@ completion works." | |||
| 1984 | ;; There are several options. Do the completion. | 1983 | ;; There are several options. Do the completion. |
| 1985 | (semantic-complete-inline-tag-engine | 1984 | (semantic-complete-inline-tag-engine |
| 1986 | collector | 1985 | collector |
| 1987 | (funcall semantic-complete-inline-analyzer-displayor-class | 1986 | (funcall semantic-complete-inline-analyzer-displayor-class) |
| 1988 | "inline displayor") | 1987 | ;;(semantic-displayor-tooltip) |
| 1989 | ;;(semantic-displayor-tooltip "simple") | ||
| 1990 | (current-buffer) | 1988 | (current-buffer) |
| 1991 | start end)) | 1989 | start end)) |
| 1992 | ))) | 1990 | ))) |
| @@ -2013,7 +2011,7 @@ prompts. these are calculated from the CONTEXT variable passed in." | |||
| 2013 | prompt | 2011 | prompt |
| 2014 | :buffer (oref context buffer) | 2012 | :buffer (oref context buffer) |
| 2015 | :context context) | 2013 | :context context) |
| 2016 | (semantic-displayor-traditional-with-focus-highlight "simple") | 2014 | (semantic-displayor-traditional-with-focus-highlight) |
| 2017 | (with-current-buffer (oref context buffer) | 2015 | (with-current-buffer (oref context buffer) |
| 2018 | (goto-char (cdr (oref context bounds))) | 2016 | (goto-char (cdr (oref context bounds))) |
| 2019 | (concat prompt (mapconcat 'identity syms ".") | 2017 | (concat prompt (mapconcat 'identity syms ".") |
| @@ -2037,7 +2035,6 @@ completion works." | |||
| 2037 | (if (not context) (setq context (semantic-analyze-current-context (point)))) | 2035 | (if (not context) (setq context (semantic-analyze-current-context (point)))) |
| 2038 | (if (not context) (error "Nothing to complete on here")) | 2036 | (if (not context) (error "Nothing to complete on here")) |
| 2039 | (let* ((collector (semantic-collector-analyze-completions | 2037 | (let* ((collector (semantic-collector-analyze-completions |
| 2040 | "inline" | ||
| 2041 | :buffer (oref context buffer) | 2038 | :buffer (oref context buffer) |
| 2042 | :context context)) | 2039 | :context context)) |
| 2043 | (syms (semantic-ctxt-current-symbol (point))) | 2040 | (syms (semantic-ctxt-current-symbol (point))) |
| @@ -2064,9 +2061,8 @@ completion works." | |||
| 2064 | ;; There are several options. Do the completion. | 2061 | ;; There are several options. Do the completion. |
| 2065 | (semantic-complete-inline-tag-engine | 2062 | (semantic-complete-inline-tag-engine |
| 2066 | collector | 2063 | collector |
| 2067 | (funcall semantic-complete-inline-analyzer-displayor-class | 2064 | (funcall semantic-complete-inline-analyzer-displayor-class) |
| 2068 | "inline displayor") | 2065 | ;;(semantic-displayor-tooltip) |
| 2069 | ;;(semantic-displayor-tooltip "simple") | ||
| 2070 | (oref context buffer) | 2066 | (oref context buffer) |
| 2071 | (car (oref context bounds)) | 2067 | (car (oref context bounds)) |
| 2072 | (cdr (oref context bounds)) | 2068 | (cdr (oref context bounds)) |
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el index c58c295cd5c..789614d511a 100644 --- a/lisp/cedet/semantic/db-javascript.el +++ b/lisp/cedet/semantic/db-javascript.el | |||
| @@ -98,7 +98,7 @@ See bottom of this file for instructions on managing this list.") | |||
| 98 | ;; Create the database, and add it to searchable databases for javascript mode. | 98 | ;; Create the database, and add it to searchable databases for javascript mode. |
| 99 | (defvar-mode-local javascript-mode semanticdb-project-system-databases | 99 | (defvar-mode-local javascript-mode semanticdb-project-system-databases |
| 100 | (list | 100 | (list |
| 101 | (semanticdb-project-database-javascript "Javascript")) | 101 | (semanticdb-project-database-javascript)) |
| 102 | "Search javascript for symbols.") | 102 | "Search javascript for symbols.") |
| 103 | 103 | ||
| 104 | ;; NOTE: Be sure to modify this to the best advantage of your | 104 | ;; NOTE: Be sure to modify this to the best advantage of your |
| @@ -115,13 +115,13 @@ the omniscience database.") | |||
| 115 | "For a javascript database, there are no explicit tables. | 115 | "For a javascript database, there are no explicit tables. |
| 116 | Create one of our special tables that can act as an intermediary." | 116 | Create one of our special tables that can act as an intermediary." |
| 117 | ;; NOTE: This method overrides an accessor for the `tables' slot in | 117 | ;; NOTE: This method overrides an accessor for the `tables' slot in |
| 118 | ;; a database. You can either construct your own (like tmp here | 118 | ;; a database. You can either construct your own (like newtable here |
| 119 | ;; or you can manage any number of tables. | 119 | ;; or you can manage any number of tables. |
| 120 | 120 | ||
| 121 | ;; We need to return something since there is always the "master table" | 121 | ;; We need to return something since there is always the "master table" |
| 122 | ;; The table can then answer file name type questions. | 122 | ;; The table can then answer file name type questions. |
| 123 | (when (not (slot-boundp obj 'tables)) | 123 | (when (not (slot-boundp obj 'tables)) |
| 124 | (let ((newtable (semanticdb-table-javascript "tmp"))) | 124 | (let ((newtable (semanticdb-table-javascript))) |
| 125 | (oset obj tables (list newtable)) | 125 | (oset obj tables (list newtable)) |
| 126 | (oset newtable parent-db obj) | 126 | (oset newtable parent-db obj) |
| 127 | (oset newtable tags nil) | 127 | (oset newtable tags nil) |
diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el index 8f20fee9545..7713a3cec53 100644 --- a/lisp/cedet/semantic/db-ref.el +++ b/lisp/cedet/semantic/db-ref.el | |||
| @@ -162,8 +162,7 @@ refreshed before dumping the result." | |||
| 162 | (let* ((tab semanticdb-current-table) | 162 | (let* ((tab semanticdb-current-table) |
| 163 | (myrefs (oref tab db-refs)) | 163 | (myrefs (oref tab db-refs)) |
| 164 | (myinc (semanticdb-includes-in-table tab)) | 164 | (myinc (semanticdb-includes-in-table tab)) |
| 165 | (adbc (semanticdb-ref-adebug "DEBUG" | 165 | (adbc (semanticdb-ref-adebug :i-depend-on myrefs |
| 166 | :i-depend-on myrefs | ||
| 167 | :local-table tab | 166 | :local-table tab |
| 168 | :i-include myinc))) | 167 | :i-include myinc))) |
| 169 | (data-debug-new-buffer "*References ADEBUG*") | 168 | (data-debug-new-buffer "*References ADEBUG*") |
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index d127b6465fe..4f05e599798 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el | |||
| @@ -361,7 +361,6 @@ Argument ONOFF is non-nil when we are entering debug mode. | |||
| 361 | (semantic-debug-current-interface | 361 | (semantic-debug-current-interface |
| 362 | (let ((parserb (semantic-debug-find-parser-source))) | 362 | (let ((parserb (semantic-debug-find-parser-source))) |
| 363 | (semantic-debug-interface | 363 | (semantic-debug-interface |
| 364 | "Debug Interface" | ||
| 365 | :parser-buffer parserb | 364 | :parser-buffer parserb |
| 366 | :parser-local-map (with-current-buffer parserb | 365 | :parser-local-map (with-current-buffer parserb |
| 367 | (current-local-map)) | 366 | (current-local-map)) |
diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el index 617ad7867f5..8c36623b72f 100644 --- a/lisp/cedet/semantic/ede-grammar.el +++ b/lisp/cedet/semantic/ede-grammar.el | |||
| @@ -67,8 +67,7 @@ For Emacs Lisp, return addsuffix command on source files." | |||
| 67 | (ede-proj-makefile-sourcevar this)))))) | 67 | (ede-proj-makefile-sourcevar this)))))) |
| 68 | 68 | ||
| 69 | (defvar semantic-ede-source-grammar-wisent | 69 | (defvar semantic-ede-source-grammar-wisent |
| 70 | (ede-sourcecode "semantic-ede-grammar-source-wisent" | 70 | (ede-sourcecode :name "Wisent Grammar" |
| 71 | :name "Wisent Grammar" | ||
| 72 | :sourcepattern "\\.wy$" | 71 | :sourcepattern "\\.wy$" |
| 73 | :garbagepattern '("*-wy.el") | 72 | :garbagepattern '("*-wy.el") |
| 74 | ) | 73 | ) |
| @@ -80,13 +79,11 @@ For Emacs Lisp, return addsuffix command on source files." | |||
| 80 | 79 | ||
| 81 | (defvar semantic-ede-grammar-compiler-wisent | 80 | (defvar semantic-ede-grammar-compiler-wisent |
| 82 | (semantic-ede-grammar-compiler-class | 81 | (semantic-ede-grammar-compiler-class |
| 83 | "ede-emacs-wisent-compiler" | ||
| 84 | :name "emacs" | 82 | :name "emacs" |
| 85 | :variables '(("EMACS" . "emacs") | 83 | :variables '(("EMACS" . "emacs") |
| 86 | ("EMACSFLAGS" . "-batch --no-site-file --eval '(setq debug-on-error t)'") | 84 | ("EMACSFLAGS" . "-batch --no-site-file --eval '(setq debug-on-error t)'") |
| 87 | ("require" . "$(foreach r,$(1),(require (quote $(r))))")) | 85 | ("require" . "$(foreach r,$(1),(require (quote $(r))))")) |
| 88 | :rules (list (ede-makefile-rule | 86 | :rules (list (ede-makefile-rule |
| 89 | "elisp-inference-rule" | ||
| 90 | :target "%-wy.el" | 87 | :target "%-wy.el" |
| 91 | :dependencies "%.wy" | 88 | :dependencies "%.wy" |
| 92 | :rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \ | 89 | :rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \ |
| @@ -98,8 +95,7 @@ For Emacs Lisp, return addsuffix command on source files." | |||
| 98 | 95 | ||
| 99 | 96 | ||
| 100 | (defvar semantic-ede-source-grammar-bovine | 97 | (defvar semantic-ede-source-grammar-bovine |
| 101 | (ede-sourcecode "semantic-ede-grammar-source-bovine" | 98 | (ede-sourcecode :name "Bovine Grammar" |
| 102 | :name "Bovine Grammar" | ||
| 103 | :sourcepattern "\\.by$" | 99 | :sourcepattern "\\.by$" |
| 104 | :garbagepattern '("*-by.el") | 100 | :garbagepattern '("*-by.el") |
| 105 | ) | 101 | ) |
| @@ -107,13 +103,11 @@ For Emacs Lisp, return addsuffix command on source files." | |||
| 107 | 103 | ||
| 108 | (defvar semantic-ede-grammar-compiler-bovine | 104 | (defvar semantic-ede-grammar-compiler-bovine |
| 109 | (semantic-ede-grammar-compiler-class | 105 | (semantic-ede-grammar-compiler-class |
| 110 | "ede-emacs-wisent-compiler" | ||
| 111 | :name "emacs" | 106 | :name "emacs" |
| 112 | :variables '(("EMACS" . "emacs") | 107 | :variables '(("EMACS" . "emacs") |
| 113 | ("EMACSFLAGS" . "-batch --no-site-file --eval '(setq debug-on-error t)'") | 108 | ("EMACSFLAGS" . "-batch --no-site-file --eval '(setq debug-on-error t)'") |
| 114 | ("require" . "$(foreach r,$(1),(require (quote $(r))))")) | 109 | ("require" . "$(foreach r,$(1),(require (quote $(r))))")) |
| 115 | :rules (list (ede-makefile-rule | 110 | :rules (list (ede-makefile-rule |
| 116 | "elisp-inference-rule" | ||
| 117 | :target "%-by.el" | 111 | :target "%-by.el" |
| 118 | :dependencies "%.by" | 112 | :dependencies "%.by" |
| 119 | :rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \ | 113 | :rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \ |
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el index bc8b1a9ef27..80844494c43 100644 --- a/lisp/cedet/semantic/mru-bookmark.el +++ b/lisp/cedet/semantic/mru-bookmark.el | |||
| @@ -166,7 +166,6 @@ We can't use the built-in ring data structure because we need | |||
| 166 | to delete some items from the ring when we don't have the data.") | 166 | to delete some items from the ring when we don't have the data.") |
| 167 | 167 | ||
| 168 | (defvar semantic-mru-bookmark-ring (semantic-bookmark-ring | 168 | (defvar semantic-mru-bookmark-ring (semantic-bookmark-ring |
| 169 | "Ring" | ||
| 170 | :ring (make-ring 20)) | 169 | :ring (make-ring 20)) |
| 171 | "The MRU bookmark ring. | 170 | "The MRU bookmark ring. |
| 172 | This ring tracks the most recent active tags of interest.") | 171 | This ring tracks the most recent active tags of interest.") |
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index a2c68ed3a63..e653d0a03dc 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el | |||
| @@ -309,7 +309,7 @@ are from nesting data types." | |||
| 309 | (list searchname))) | 309 | (list searchname))) |
| 310 | (fullsearchname nil) | 310 | (fullsearchname nil) |
| 311 | 311 | ||
| 312 | (miniscope (semantic-scope-cache "mini")) | 312 | (miniscope (semantic-scope-cache)) |
| 313 | ptag) | 313 | ptag) |
| 314 | 314 | ||
| 315 | ;; Find the next entry in the referenced type for | 315 | ;; Find the next entry in the referenced type for |
| @@ -368,7 +368,7 @@ and PROTECTION is the level of protection offered by the relationship. | |||
| 368 | Optional SCOPETYPES are additional scoped entities in which our parent might | 368 | Optional SCOPETYPES are additional scoped entities in which our parent might |
| 369 | be found." | 369 | be found." |
| 370 | (let ((lineage nil) | 370 | (let ((lineage nil) |
| 371 | (miniscope (semantic-scope-cache "mini")) | 371 | (miniscope (semantic-scope-cache)) |
| 372 | ) | 372 | ) |
| 373 | (oset miniscope parents parents) | 373 | (oset miniscope parents parents) |
| 374 | (oset miniscope scope scopetypes) | 374 | (oset miniscope scope scopetypes) |
| @@ -644,7 +644,7 @@ whose tags can be searched when needed, OR it may be a scope object." | |||
| 644 | ;; We need to make a mini scope, and only include the misc bits | 644 | ;; We need to make a mini scope, and only include the misc bits |
| 645 | ;; that will help in finding the parent. We don't really need | 645 | ;; that will help in finding the parent. We don't really need |
| 646 | ;; to do any of the stuff related to variables and what-not. | 646 | ;; to do any of the stuff related to variables and what-not. |
| 647 | (setq tmpscope (semantic-scope-cache "mini")) | 647 | (setq tmpscope (semantic-scope-cache)) |
| 648 | (let* ( ;; Step 1: | 648 | (let* ( ;; Step 1: |
| 649 | (scopetypes (cons type (semantic-analyze-scoped-types (point)))) | 649 | (scopetypes (cons type (semantic-analyze-scoped-types (point)))) |
| 650 | (parents (semantic-analyze-scope-nested-tags (point) scopetypes)) | 650 | (parents (semantic-analyze-scope-nested-tags (point) scopetypes)) |
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index 7fe19324793..1fdfd104a5e 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el | |||
| @@ -378,7 +378,6 @@ Optional argument POINT is where to look for the environment." | |||
| 378 | (when prefix | 378 | (when prefix |
| 379 | (require 'semantic/analyze) | 379 | (require 'semantic/analyze) |
| 380 | (semantic-analyze-context | 380 | (semantic-analyze-context |
| 381 | "Context-for-texinfo" | ||
| 382 | :buffer (current-buffer) | 381 | :buffer (current-buffer) |
| 383 | :scope nil | 382 | :scope nil |
| 384 | :bounds bounds | 383 | :bounds bounds |