diff options
| author | Paul Eggert | 2011-06-15 11:07:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-15 11:07:38 -0700 |
| commit | ff672d2c8785de6faba84a400fb8153e9fa07cd2 (patch) | |
| tree | 4c5dc68b7a92e54c86e47f3bd9a804c14be57091 /lisp/progmodes/ld-script.el | |
| parent | e69dafade3ccd5c2997a3f6fd6c7bea29e75ad8e (diff) | |
| parent | b96e6cde3e311cd79f8ad134291d41c8c64cc6ad (diff) | |
| download | emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.tar.gz emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/progmodes/ld-script.el')
| -rw-r--r-- | lisp/progmodes/ld-script.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index 8bdac61d4ab..c682bfa0280 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el | |||
| @@ -168,7 +168,7 @@ | |||
| 168 | "Default font-lock-keywords for `ld-script-mode'.") | 168 | "Default font-lock-keywords for `ld-script-mode'.") |
| 169 | 169 | ||
| 170 | ;;;###autoload | 170 | ;;;###autoload |
| 171 | (define-derived-mode ld-script-mode nil "LD-Script" | 171 | (define-derived-mode ld-script-mode prog-mode "LD-Script" |
| 172 | "A major mode to edit GNU ld script files" | 172 | "A major mode to edit GNU ld script files" |
| 173 | (set (make-local-variable 'comment-start) "/* ") | 173 | (set (make-local-variable 'comment-start) "/* ") |
| 174 | (set (make-local-variable 'comment-end) " */") | 174 | (set (make-local-variable 'comment-end) " */") |