# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1307980802 18000
# Node ID 863f1503616fbdea0ce8f1a1f2ab281b3cf686c9
# Parent  31f86a5707ee77e74588884d47d463ea66d2982d
emacs java: adjustments from actual java hackery

diff --git a/.elisp/settings/40.modes.el b/.elisp/settings/40.modes.el
--- a/.elisp/settings/40.modes.el
+++ b/.elisp/settings/40.modes.el
@@ -91,7 +91,7 @@ point."
 (column-number-mode)
 
 
-(defun annotation-fix (unused)
+(defun af-annotation-fix (unused)
   "fix indentation after an annotation"
   (save-excursion
     (beginning-of-line)
@@ -100,10 +100,11 @@ point."
         0
       (+ c-basic-offset c-basic-offset))))
 
-(add-hook 'java-mode-hook
-          (lambda ()
-            (c-set-offset 'topmost-intro-cont
-                          annotation-fix)))
+(defun af-java-mode-hook ()
+  (c-set-offset 'topmost-intro-cont 'af-annotation-fix)
+  (local-set-key (kbd "RET") 'comment-indent-new-line)
+  (af-tab-fix))
+(add-hook 'java-mode-hook 'af-java-mode-hook)
 
 ;; mq diff-mode support
 (add-to-list 'auto-mode-alist '("\\.hg/patches/" . diff-mode))