Changeset 4085 for trunk/lisp/progmodes/cc-subword.el

Timestamp:

05/18/06 16:19:18 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/progmodes/cc-subword.el (modified) (6 diffs)

trunk/lisp/progmodes/cc-subword.el

@@ -168 +168 @@
-    (point))))
-
+(put 'c-forward-subword 'CUA 'move)
+
-(defun c-backward-subword (&optional arg)
-  "Do the same as `backward-word' but on subwords.
@@ -194 +196 @@
-          nil t))))
-
+(put 'c-backward-subword 'CUA 'move)
+
-(defun c-kill-subword (arg)
-  "Do the same as `kill-word' but on subwords.
@@ -223 +227 @@
-        (direction (if (< 0 arg) 1 -1)))
-    (dotimes (i count)
- 
+
-             (concat "[" c-alpha "]")
-             nil t)
@@ -254 +258 @@
-(defun c-forward-subword-internal ()
-  (if (and
- 
+
-         (let ((case-fold-search nil))
- 
+
-            (concat "\\W*\\(\\([" c-upper "]*\\W?\\)[" c-lower c-digit "]*\\)")
-            nil t)))
@@ -262 +266 @@
-                                  ; "word-constituent" which isn't c-upper,
-                                  ; c-lower or c-digit
- 
+
-       (cond
-        ((< 1 (- (match-end 2) (match-beginning 2)))
@@ -272 +276 @@
-
-(defun c-backward-subword-internal ()
- 
- 
+
+
-          (re-search-backward
-           (concat
-            "\\(\\(\\W\\|[" c-lower c-digit "]\\)\\([" c-upper "]+\\W*\\)"
- 
+
-           nil t)))
- 
- 
+
+
-        ((and (match-end 3)
-              (< 1 (- (match-end 3) (match-beginning 3)))