(electric-c++-terminator): Fix logic for handling colon.

diff --git a/lisp/progmodes/cplus-md.el b/lisp/progmodes/cplus-md.el
index 647f08ba493699bbe4a0a9a29a475cdea9b5064d..8c93118d91b33425701a0adc73097418e7738cd6 100644 (file)
--- a/lisp/progmodes/cplus-md.el
+++ b/lisp/progmodes/cplus-md.el
@@ -301,15 +301,15 @@ no args if that value is non-nil."
                        ;; So quickly rule out most other uses of colon
                        ;; and do no indentation for them.
                        (and (eq last-command-char ?:)
-                            (not (looking-at "case[ \t]"))
-                            (save-excursion
-                              (forward-word 1)
-                              (skip-chars-forward " \t")
-                              (< (point) end))
-                            ;; Do re-indent double colons
-                            (save-excursion
-                              (end-of-line 1)
-                              (looking-at ":")))
+                            (or (not (or (looking-at "case[ \t]")
+                                         (save-excursion
+                                           (forward-word 1)
+                                           (skip-chars-forward " \t")
+                                           (>= (point) end))))
+                                ;; Do re-indent double colons
+                                (save-excursion
+                                  (end-of-line 1)
+                                  (looking-at ":"))))
                        (progn
                          (beginning-of-defun)
                          (let ((pps (parse-partial-sexp (point) end)))