indent-cpp-directive でマクロがインデントしていた場合に対応. #194

lisp/c-mode.l

@@ -132,29 +132,28 @@
 (defun indent-cpp-directive ()
   (interactive)
   (save-excursion
-    (let ((column 1))
+    (let ((nest 0))
       (goto-char (point-min))
-      (while (scan-buffer "^#" :regexp t)
-	(forward-char 1)
+      (while (scan-buffer "^[ \t]*#" :regexp t :tail t)
 	(cond ((looking-at "[ \t]*if")
-	       (cpp-indent-to column)
-	       (setq column (1+ column)))
+	       (cpp-indent-to (+ (current-column) nest))
+	       (incf nest))
 	      ((looking-at "[ \t]*el\\(se\\|if\\)")
-	       (cpp-indent-to (1- column)))
+	       (cpp-indent-to (+ (current-column) (1- nest))))
 	      ((looking-at "[ \t]*endif")
-	       (setq column (1- column))
-	       (when (zerop column)
+	       (decf nest)
+	       (when (minusp nest)
 		 (error "Unmatched \"#endif\" at line ~d" (current-line-number)))
-	       (cpp-indent-to column))
-	      (t (cpp-indent-to column)
+	       (cpp-indent-to (+ (current-column) nest)))
+	      (t (cpp-indent-to (+ (current-column) nest))
 		 (if (looking-for "define")
 		     (while (and (progn
 				   (goto-eol)
 				   (forward-char -1)
 				   (looking-for "\\"))
 				 (forward-line 1))
 		       (c-indent-line))))))
-      (when (/= column 1)
+      (when (/= nest 0)
 	(error "Unmatched \"#if\" or \"#ifdef\""))))
   t)