Mercurial > emacs
changeset 101755:b6273f409a73
(vhdl-mode-abbrev-table-init):
Mark the entries as being "system" entries rather than "user" entries.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 02 Feb 2009 20:40:18 +0000 |
| parents | 9f52c80daf1b |
| children | 5f840f1a34d4 |
| files | lisp/ChangeLog lisp/progmodes/vhdl-mode.el |
| diffstat | 2 files changed, 142 insertions(+), 138 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Feb 02 16:06:58 2009 +0000 +++ b/lisp/ChangeLog Mon Feb 02 20:40:18 2009 +0000 @@ -1,3 +1,8 @@ +2009-02-02 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/vhdl-mode.el (vhdl-mode-abbrev-table-init): + Mark the entries as being "system" entries rather than "user" entries. + 2009-02-02 Thien-Thi Nguyen <ttn@gnuvola.org> * smerge-mode.el (smerge-start-session): Add interactive spec.
--- a/lisp/progmodes/vhdl-mode.el Mon Feb 02 16:06:58 2009 +0000 +++ b/lisp/progmodes/vhdl-mode.el Mon Feb 02 20:40:18 2009 +0000 @@ -2898,149 +2898,148 @@ (append (when (memq 'vhdl vhdl-electric-keywords) ;; VHDL'93 keywords - '( - ("--" "" vhdl-template-display-comment-hook 0) - ("abs" "" vhdl-template-default-hook 0) - ("access" "" vhdl-template-default-hook 0) - ("after" "" vhdl-template-default-hook 0) - ("alias" "" vhdl-template-alias-hook 0) - ("all" "" vhdl-template-default-hook 0) - ("and" "" vhdl-template-default-hook 0) - ("arch" "" vhdl-template-architecture-hook 0) - ("architecture" "" vhdl-template-architecture-hook 0) - ("array" "" vhdl-template-default-hook 0) - ("assert" "" vhdl-template-assert-hook 0) - ("attr" "" vhdl-template-attribute-hook 0) - ("attribute" "" vhdl-template-attribute-hook 0) - ("begin" "" vhdl-template-default-indent-hook 0) - ("block" "" vhdl-template-block-hook 0) - ("body" "" vhdl-template-default-hook 0) - ("buffer" "" vhdl-template-default-hook 0) - ("bus" "" vhdl-template-default-hook 0) - ("case" "" vhdl-template-case-hook 0) - ("comp" "" vhdl-template-component-hook 0) - ("component" "" vhdl-template-component-hook 0) - ("cond" "" vhdl-template-conditional-signal-asst-hook 0) - ("conditional" "" vhdl-template-conditional-signal-asst-hook 0) - ("conf" "" vhdl-template-configuration-hook 0) - ("configuration" "" vhdl-template-configuration-hook 0) - ("cons" "" vhdl-template-constant-hook 0) - ("constant" "" vhdl-template-constant-hook 0) - ("disconnect" "" vhdl-template-disconnect-hook 0) - ("downto" "" vhdl-template-default-hook 0) - ("else" "" vhdl-template-else-hook 0) - ("elseif" "" vhdl-template-elsif-hook 0) - ("elsif" "" vhdl-template-elsif-hook 0) - ("end" "" vhdl-template-default-indent-hook 0) - ("entity" "" vhdl-template-entity-hook 0) - ("exit" "" vhdl-template-exit-hook 0) - ("file" "" vhdl-template-file-hook 0) - ("for" "" vhdl-template-for-hook 0) - ("func" "" vhdl-template-function-hook 0) - ("function" "" vhdl-template-function-hook 0) - ("generic" "" vhdl-template-generic-hook 0) - ("group" "" vhdl-template-group-hook 0) - ("guarded" "" vhdl-template-default-hook 0) - ("if" "" vhdl-template-if-hook 0) - ("impure" "" vhdl-template-default-hook 0) - ("in" "" vhdl-template-default-hook 0) - ("inertial" "" vhdl-template-default-hook 0) - ("inout" "" vhdl-template-default-hook 0) - ("inst" "" vhdl-template-instance-hook 0) - ("instance" "" vhdl-template-instance-hook 0) - ("is" "" vhdl-template-default-hook 0) - ("label" "" vhdl-template-default-hook 0) - ("library" "" vhdl-template-library-hook 0) - ("linkage" "" vhdl-template-default-hook 0) - ("literal" "" vhdl-template-default-hook 0) - ("loop" "" vhdl-template-bare-loop-hook 0) - ("map" "" vhdl-template-map-hook 0) - ("mod" "" vhdl-template-default-hook 0) - ("nand" "" vhdl-template-default-hook 0) - ("new" "" vhdl-template-default-hook 0) - ("next" "" vhdl-template-next-hook 0) - ("nor" "" vhdl-template-default-hook 0) - ("not" "" vhdl-template-default-hook 0) - ("null" "" vhdl-template-default-hook 0) - ("of" "" vhdl-template-default-hook 0) - ("on" "" vhdl-template-default-hook 0) - ("open" "" vhdl-template-default-hook 0) - ("or" "" vhdl-template-default-hook 0) - ("others" "" vhdl-template-others-hook 0) - ("out" "" vhdl-template-default-hook 0) - ("pack" "" vhdl-template-package-hook 0) - ("package" "" vhdl-template-package-hook 0) - ("port" "" vhdl-template-port-hook 0) - ("postponed" "" vhdl-template-default-hook 0) - ("procedure" "" vhdl-template-procedure-hook 0) - ("process" "" vhdl-template-process-hook 0) - ("pure" "" vhdl-template-default-hook 0) - ("range" "" vhdl-template-default-hook 0) - ("record" "" vhdl-template-default-hook 0) - ("register" "" vhdl-template-default-hook 0) - ("reject" "" vhdl-template-default-hook 0) - ("rem" "" vhdl-template-default-hook 0) - ("report" "" vhdl-template-report-hook 0) - ("return" "" vhdl-template-return-hook 0) - ("rol" "" vhdl-template-default-hook 0) - ("ror" "" vhdl-template-default-hook 0) - ("select" "" vhdl-template-selected-signal-asst-hook 0) - ("severity" "" vhdl-template-default-hook 0) - ("shared" "" vhdl-template-default-hook 0) - ("sig" "" vhdl-template-signal-hook 0) - ("signal" "" vhdl-template-signal-hook 0) - ("sla" "" vhdl-template-default-hook 0) - ("sll" "" vhdl-template-default-hook 0) - ("sra" "" vhdl-template-default-hook 0) - ("srl" "" vhdl-template-default-hook 0) - ("subtype" "" vhdl-template-subtype-hook 0) - ("then" "" vhdl-template-default-hook 0) - ("to" "" vhdl-template-default-hook 0) - ("transport" "" vhdl-template-default-hook 0) - ("type" "" vhdl-template-type-hook 0) - ("unaffected" "" vhdl-template-default-hook 0) - ("units" "" vhdl-template-default-hook 0) - ("until" "" vhdl-template-default-hook 0) - ("use" "" vhdl-template-use-hook 0) - ("var" "" vhdl-template-variable-hook 0) - ("variable" "" vhdl-template-variable-hook 0) - ("wait" "" vhdl-template-wait-hook 0) - ("when" "" vhdl-template-when-hook 0) - ("while" "" vhdl-template-while-loop-hook 0) - ("with" "" vhdl-template-with-hook 0) - ("xnor" "" vhdl-template-default-hook 0) - ("xor" "" vhdl-template-default-hook 0) - )) + (mapcar (lambda (x) (list (car x) "" (cdr x) 0 'system)) + '( + ("--" . vhdl-template-display-comment-hook) + ("abs" . vhdl-template-default-hook) + ("access" . vhdl-template-default-hook) + ("after" . vhdl-template-default-hook) + ("alias" . vhdl-template-alias-hook) + ("all" . vhdl-template-default-hook) + ("and" . vhdl-template-default-hook) + ("arch" . vhdl-template-architecture-hook) + ("architecture" . vhdl-template-architecture-hook) + ("array" . vhdl-template-default-hook) + ("assert" . vhdl-template-assert-hook) + ("attr" . vhdl-template-attribute-hook) + ("attribute" . vhdl-template-attribute-hook) + ("begin" . vhdl-template-default-indent-hook) + ("block" . vhdl-template-block-hook) + ("body" . vhdl-template-default-hook) + ("buffer" . vhdl-template-default-hook) + ("bus" . vhdl-template-default-hook) + ("case" . vhdl-template-case-hook) + ("comp" . vhdl-template-component-hook) + ("component" . vhdl-template-component-hook) + ("cond" . vhdl-template-conditional-signal-asst-hook) + ("conditional" . vhdl-template-conditional-signal-asst-hook) + ("conf" . vhdl-template-configuration-hook) + ("configuration" . vhdl-template-configuration-hook) + ("cons" . vhdl-template-constant-hook) + ("constant" . vhdl-template-constant-hook) + ("disconnect" . vhdl-template-disconnect-hook) + ("downto" . vhdl-template-default-hook) + ("else" . vhdl-template-else-hook) + ("elseif" . vhdl-template-elsif-hook) + ("elsif" . vhdl-template-elsif-hook) + ("end" . vhdl-template-default-indent-hook) + ("entity" . vhdl-template-entity-hook) + ("exit" . vhdl-template-exit-hook) + ("file" . vhdl-template-file-hook) + ("for" . vhdl-template-for-hook) + ("func" . vhdl-template-function-hook) + ("function" . vhdl-template-function-hook) + ("generic" . vhdl-template-generic-hook) + ("group" . vhdl-template-group-hook) + ("guarded" . vhdl-template-default-hook) + ("if" . vhdl-template-if-hook) + ("impure" . vhdl-template-default-hook) + ("in" . vhdl-template-default-hook) + ("inertial" . vhdl-template-default-hook) + ("inout" . vhdl-template-default-hook) + ("inst" . vhdl-template-instance-hook) + ("instance" . vhdl-template-instance-hook) + ("is" . vhdl-template-default-hook) + ("label" . vhdl-template-default-hook) + ("library" . vhdl-template-library-hook) + ("linkage" . vhdl-template-default-hook) + ("literal" . vhdl-template-default-hook) + ("loop" . vhdl-template-bare-loop-hook) + ("map" . vhdl-template-map-hook) + ("mod" . vhdl-template-default-hook) + ("nand" . vhdl-template-default-hook) + ("new" . vhdl-template-default-hook) + ("next" . vhdl-template-next-hook) + ("nor" . vhdl-template-default-hook) + ("not" . vhdl-template-default-hook) + ("null" . vhdl-template-default-hook) + ("of" . vhdl-template-default-hook) + ("on" . vhdl-template-default-hook) + ("open" . vhdl-template-default-hook) + ("or" . vhdl-template-default-hook) + ("others" . vhdl-template-others-hook) + ("out" . vhdl-template-default-hook) + ("pack" . vhdl-template-package-hook) + ("package" . vhdl-template-package-hook) + ("port" . vhdl-template-port-hook) + ("postponed" . vhdl-template-default-hook) + ("procedure" . vhdl-template-procedure-hook) + ("process" . vhdl-template-process-hook) + ("pure" . vhdl-template-default-hook) + ("range" . vhdl-template-default-hook) + ("record" . vhdl-template-default-hook) + ("register" . vhdl-template-default-hook) + ("reject" . vhdl-template-default-hook) + ("rem" . vhdl-template-default-hook) + ("report" . vhdl-template-report-hook) + ("return" . vhdl-template-return-hook) + ("rol" . vhdl-template-default-hook) + ("ror" . vhdl-template-default-hook) + ("select" . vhdl-template-selected-signal-asst-hook) + ("severity" . vhdl-template-default-hook) + ("shared" . vhdl-template-default-hook) + ("sig" . vhdl-template-signal-hook) + ("signal" . vhdl-template-signal-hook) + ("sla" . vhdl-template-default-hook) + ("sll" . vhdl-template-default-hook) + ("sra" . vhdl-template-default-hook) + ("srl" . vhdl-template-default-hook) + ("subtype" . vhdl-template-subtype-hook) + ("then" . vhdl-template-default-hook) + ("to" . vhdl-template-default-hook) + ("transport" . vhdl-template-default-hook) + ("type" . vhdl-template-type-hook) + ("unaffected" . vhdl-template-default-hook) + ("units" . vhdl-template-default-hook) + ("until" . vhdl-template-default-hook) + ("use" . vhdl-template-use-hook) + ("var" . vhdl-template-variable-hook) + ("variable" . vhdl-template-variable-hook) + ("wait" . vhdl-template-wait-hook) + ("when" . vhdl-template-when-hook) + ("while" . vhdl-template-while-loop-hook) + ("with" . vhdl-template-with-hook) + ("xnor" . vhdl-template-default-hook) + ("xor" . vhdl-template-default-hook) + ))) ;; VHDL-AMS keywords (when (and (memq 'vhdl vhdl-electric-keywords) (vhdl-standard-p 'ams)) - '( - ("across" "" vhdl-template-default-hook 0) - ("break" "" vhdl-template-break-hook 0) - ("limit" "" vhdl-template-limit-hook 0) - ("nature" "" vhdl-template-nature-hook 0) - ("noise" "" vhdl-template-default-hook 0) - ("procedural" "" vhdl-template-procedural-hook 0) - ("quantity" "" vhdl-template-quantity-hook 0) - ("reference" "" vhdl-template-default-hook 0) - ("spectrum" "" vhdl-template-default-hook 0) - ("subnature" "" vhdl-template-subnature-hook 0) - ("terminal" "" vhdl-template-terminal-hook 0) - ("through" "" vhdl-template-default-hook 0) - ("tolerance" "" vhdl-template-default-hook 0) - )) + (mapcar (lambda (x) (list (car x) "" (cdr x) 0 'system)) + '( + ("across" . vhdl-template-default-hook) + ("break" . vhdl-template-break-hook) + ("limit" . vhdl-template-limit-hook) + ("nature" . vhdl-template-nature-hook) + ("noise" . vhdl-template-default-hook) + ("procedural" . vhdl-template-procedural-hook) + ("quantity" . vhdl-template-quantity-hook) + ("reference" . vhdl-template-default-hook) + ("spectrum" . vhdl-template-default-hook) + ("subnature" . vhdl-template-subnature-hook) + ("terminal" . vhdl-template-terminal-hook) + ("through" . vhdl-template-default-hook) + ("tolerance" . vhdl-template-default-hook) + ))) ;; user model keywords (when (memq 'user vhdl-electric-keywords) - (let ((alist vhdl-model-alist) - abbrev-list keyword) - (while alist - (setq keyword (nth 3 (car alist))) + (let (abbrev-list keyword) + (dolist (elem vhdl-model-alist) + (setq keyword (nth 3 elem)) (unless (equal keyword "") - (setq abbrev-list - (cons (list keyword "" - (vhdl-function-name - "vhdl-model" (nth 0 (car alist)) "hook") 0) - abbrev-list))) - (setq alist (cdr alist))) + (push (list keyword "" + (vhdl-function-name + "vhdl-model" (nth 0 elem) "hook") 0 'system) + abbrev-list))) abbrev-list))))) ;; initialize abbrev table for VHDL Mode