[nongnu] elpa/d-mode e15f60d 016/346: Merge branch 'master' of https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode

[ELPA Syncer]

branch: elpa/d-mode
commit e15f60d5c29cbd381809ee99fb7b1f75afd911ff
Merge: 1e3df1c a587c35
Author: Roy Crihfield <rscrihf@gmail.com>
Commit: Roy Crihfield <rscrihf@gmail.com>

    Merge branch 'master' of 
https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
---
 d-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/d-mode.el b/d-mode.el
index 05646a1..5661fbf 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -372,7 +372,7 @@ operators."
   (if (functionp 'prog-mode) 'prog-mode 'fundamental-mode))
 
 ;;;###autoload
-(define-derived-mode d-mode prog-mode "D"
+(define-derived-mode d-mode d-parent-mode "D"
   "Major mode for editing code written in the D Programming Language.
 See http://www.digitalmars.com/d for more information about the D language.
 The hook `c-mode-common-hook' is run with no args at mode