diff options
| author | Glenn Morris | 2014-03-30 17:08:55 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-03-30 17:08:55 -0700 |
| commit | 5c30ab7a71cbd9ca50e2baa2baad595005f5e5f3 (patch) | |
| tree | 440471b0e1b04821321b8703a90ccdd642070dd9 | |
| parent | 1861d5a7121b349c4fb4db0ea06c898fcc85ca76 (diff) | |
| download | emacs-5c30ab7a71cbd9ca50e2baa2baad595005f5e5f3.tar.gz emacs-5c30ab7a71cbd9ca50e2baa2baad595005f5e5f3.zip | |
vhdl-mode.el small fixup
* lisp/progmodes/vhdl-mode.el (vhdl-expand-abbrev, vhdl-expand-paren):
Revert 2014-03-26 merge goof; go back to using defalias.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg01104.html
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/vhdl-mode.el | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af658ee09b6..6f0afb1a9e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-31 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/vhdl-mode.el (vhdl-expand-abbrev, vhdl-expand-paren): | ||
| 4 | Revert 2014-03-26 merge goof; go back to using defalias. | ||
| 5 | |||
| 1 | 2014-03-30 Daniel Colascione <dancol@dancol.org> | 6 | 2014-03-30 Daniel Colascione <dancol@dancol.org> |
| 2 | 7 | ||
| 3 | * comint.el (comint-send-input): Deactivate | 8 | * comint.el (comint-send-input): Deactivate |
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 458c4bd15f5..f8d5f115c62 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el | |||
| @@ -12635,17 +12635,15 @@ expressions (e.g. for index ranges of types and signals)." | |||
| 12635 | (defalias 'he-list-beg 'vhdl-he-list-beg)) | 12635 | (defalias 'he-list-beg 'vhdl-he-list-beg)) |
| 12636 | 12636 | ||
| 12637 | ;; function for expanding abbrevs and dabbrevs | 12637 | ;; function for expanding abbrevs and dabbrevs |
| 12638 | (defun vhdl-expand-abbrev (arg)) | 12638 | (defalias 'vhdl-expand-abbrev (make-hippie-expand-function |
| 12639 | (fset 'vhdl-expand-abbrev (make-hippie-expand-function | 12639 | '(try-expand-dabbrev |
| 12640 | '(try-expand-dabbrev | 12640 | try-expand-dabbrev-all-buffers |
| 12641 | try-expand-dabbrev-all-buffers | 12641 | vhdl-try-expand-abbrev))) |
| 12642 | vhdl-try-expand-abbrev))) | ||
| 12643 | 12642 | ||
| 12644 | ;; function for expanding parenthesis | 12643 | ;; function for expanding parenthesis |
| 12645 | (defun vhdl-expand-paren (arg)) | 12644 | (defalias 'vhdl-expand-paren (make-hippie-expand-function |
| 12646 | (fset 'vhdl-expand-paren (make-hippie-expand-function | 12645 | '(try-expand-list |
| 12647 | '(try-expand-list | 12646 | try-expand-list-all-buffers))) |
| 12648 | try-expand-list-all-buffers))) | ||
| 12649 | 12647 | ||
| 12650 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 12648 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 12651 | ;; Line handling functions | 12649 | ;; Line handling functions |