diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lisp/cedet/srecode/srt.el | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lisp/cedet/srecode/srt.el')
| -rw-r--r-- | lisp/cedet/srecode/srt.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el index 3875246cb37..1fad31dafd6 100644 --- a/lisp/cedet/srecode/srt.el +++ b/lisp/cedet/srecode/srt.el | |||
| @@ -69,6 +69,7 @@ DEFAULT is the default if RET is hit." | |||
| 69 | nil initial (or hist 'srecode-read-major-mode-history)) | 69 | nil initial (or hist 'srecode-read-major-mode-history)) |
| 70 | ) | 70 | ) |
| 71 | 71 | ||
| 72 | ;;;###autoload | ||
| 72 | (defun srecode-semantic-handle-:srt (dict) | 73 | (defun srecode-semantic-handle-:srt (dict) |
| 73 | "Add macros into the dictionary DICT based on the current SRT file. | 74 | "Add macros into the dictionary DICT based on the current SRT file. |
| 74 | Adds the following: | 75 | Adds the following: |
| @@ -104,4 +105,9 @@ MODE - The mode of this buffer. If not declared yet, guess." | |||
| 104 | 105 | ||
| 105 | (provide 'srecode/srt) | 106 | (provide 'srecode/srt) |
| 106 | 107 | ||
| 108 | ;; Local variables: | ||
| 109 | ;; generated-autoload-file: "loaddefs.el" | ||
| 110 | ;; generated-autoload-load-name: "srecode/srt" | ||
| 111 | ;; End: | ||
| 112 | |||
| 107 | ;;; srecode/srt.el ends here | 113 | ;;; srecode/srt.el ends here |