objc-mode: Handle (de)propertization of < and >.

* lisp/progmodes/cc-langs.el
(c-get-state-before-change-functions)
(c-before-font-lock-functions): Separate the C and objc
versions, and add (to the first) c-unmark-<>-around-region and
c-before-change-check-<>-operators, (to the second)
c-unmark-<>-around-region and c-restore-<>-properties into the
objc versions of these lang variables.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 2422cf3deb0daed9d26e7406821d255ace743678..4e2ae5d85a6945c4dfa3f305eefbd4ad2775ad4b 100644 (file)
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -462,12 +462,20 @@ so that all identifiers are recognized as words.")
        c-before-change-check-unbalanced-strings
        c-parse-quotes-before-change
        c-before-change-fix-comment-escapes)
-  (c objc) '(c-extend-region-for-CPP
-            c-depropertize-CPP
-            c-truncate-bs-cache
-            c-before-change-check-unbalanced-strings
-            c-parse-quotes-before-change
-            c-before-change-fix-comment-escapes)
+  c '(c-extend-region-for-CPP
+      c-depropertize-CPP
+      c-truncate-bs-cache
+      c-before-change-check-unbalanced-strings
+      c-parse-quotes-before-change
+      c-before-change-fix-comment-escapes)
+  objc '(c-extend-region-for-CPP
+        c-depropertize-CPP
+        c-truncate-bs-cache
+        c-before-change-check-unbalanced-strings
+        c-unmark-<>-around-region
+        c-before-change-check-<>-operators
+        c-parse-quotes-before-change
+        c-before-change-fix-comment-escapes)
   java '(c-parse-quotes-before-change
         c-unmark-<>-around-region
         c-before-change-check-unbalanced-strings
@@ -504,14 +512,24 @@ parameters \(point-min) and \(point-max).")
       c-after-change-escape-NL-in-string
       c-after-change-mark-abnormal-strings
       c-change-expand-fl-region)
-  (c objc) '(c-depropertize-new-text
-            c-after-change-fix-comment-escapes
-            c-after-change-escape-NL-in-string
-            c-parse-quotes-after-change
-            c-after-change-mark-abnormal-strings
-            c-extend-font-lock-region-for-macros
-            c-neutralize-syntax-in-CPP
-            c-change-expand-fl-region)
+  c '(c-depropertize-new-text
+      c-after-change-fix-comment-escapes
+      c-after-change-escape-NL-in-string
+      c-parse-quotes-after-change
+      c-after-change-mark-abnormal-strings
+      c-extend-font-lock-region-for-macros
+      c-neutralize-syntax-in-CPP
+      c-change-expand-fl-region)
+  objc '(c-depropertize-new-text
+        c-after-change-fix-comment-escapes
+        c-after-change-escape-NL-in-string
+        c-parse-quotes-after-change
+        c-after-change-mark-abnormal-strings
+        c-unmark-<>-around-region
+        c-extend-font-lock-region-for-macros
+        c-neutralize-syntax-in-CPP
+        c-restore-<>-properties
+        c-change-expand-fl-region)
   c++ '(c-depropertize-new-text
        c-after-change-fix-comment-escapes
        c-after-change-escape-NL-in-string