diff options
| author | Lars Ingebrigtsen | 2019-06-14 17:03:59 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-06-14 17:03:59 +0200 |
| commit | 9b5592b5da87cff27f552a90697cb749c1ba10e9 (patch) | |
| tree | c9dd3736799dffcf9d464bab7f0725c880ab2895 | |
| parent | 7f6b0c1ee93663892c6220b982f7bc3275dcaa85 (diff) | |
| download | emacs-9b5592b5da87cff27f552a90697cb749c1ba10e9.tar.gz emacs-9b5592b5da87cff27f552a90697cb749c1ba10e9.zip | |
Revert "srecode/srt-mode compilation fix"
This led to a recursive require.
This reverts commit 9fac0e70e3f5b7d0b12b77cac50078e01f68ee70.
| -rw-r--r-- | lisp/cedet/srecode/srt-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 89301d61586..a4c8cbd1d01 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el | |||
| @@ -28,11 +28,11 @@ | |||
| 28 | (require 'semantic) | 28 | (require 'semantic) |
| 29 | (require 'semantic/analyze) | 29 | (require 'semantic/analyze) |
| 30 | (require 'semantic/wisent) | 30 | (require 'semantic/wisent) |
| 31 | (require 'srecode/insert) | ||
| 32 | (eval-when-compile | 31 | (eval-when-compile |
| 33 | (require 'semantic/find)) | 32 | (require 'semantic/find)) |
| 34 | 33 | ||
| 35 | (declare-function srecode-create-dictionary "srecode/dictionary") | 34 | (declare-function srecode-create-dictionary "srecode/dictionary") |
| 35 | (declare-function srecode-resolve-argument-list "srecode/insert") | ||
| 36 | 36 | ||
| 37 | ;;; Code: | 37 | ;;; Code: |
| 38 | (defvar srecode-template-mode-syntax-table | 38 | (defvar srecode-template-mode-syntax-table |
| @@ -429,6 +429,7 @@ Moves to the end of one named section." | |||
| 429 | (define-mode-local-override semantic-get-local-arguments | 429 | (define-mode-local-override semantic-get-local-arguments |
| 430 | srecode-template-mode (&optional point) | 430 | srecode-template-mode (&optional point) |
| 431 | "Get local arguments from an SRecode template." | 431 | "Get local arguments from an SRecode template." |
| 432 | (require 'srecode/insert) | ||
| 432 | (save-excursion | 433 | (save-excursion |
| 433 | (when point (goto-char (point))) | 434 | (when point (goto-char (point))) |
| 434 | (let* ((tag (semantic-current-tag)) | 435 | (let* ((tag (semantic-current-tag)) |