aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode
diff options
context:
space:
mode:
authorPaul Eggert2011-11-13 20:35:22 -0800
committerPaul Eggert2011-11-13 20:35:22 -0800
commitc3ca24d48c10fb771ee02eb58f7d49bd82d6306e (patch)
treee707b79a846623490feea39a4dceb86dd218eb4d /lisp/cedet/srecode
parent6a0bf43d7c5961297aa5024aec534e5bab73c8af (diff)
parent56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff)
downloademacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.tar.gz
emacs-c3ca24d48c10fb771ee02eb58f7d49bd82d6306e.zip
Merge from trunk.
Diffstat (limited to 'lisp/cedet/srecode')
-rw-r--r--lisp/cedet/srecode/extract.el2
-rw-r--r--lisp/cedet/srecode/getset.el2
-rw-r--r--lisp/cedet/srecode/mode.el2
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index dba4b876edb..80e6f9d8d1c 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -66,7 +66,7 @@
66 66
67(defmethod srecode-extract-state-extract ((st srecode-extract-state) 67(defmethod srecode-extract-state-extract ((st srecode-extract-state)
68 endpoint) 68 endpoint)
69 "Perform an extraction on the extract state ST with ENDPOITNT. 69 "Perform an extraction on the extract state ST with ENDPOINT.
70If there was no waiting inserter, do nothing." 70If there was no waiting inserter, do nothing."
71 (when (oref st lastinserter) 71 (when (oref st lastinserter)
72 (save-match-data 72 (save-match-data
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index a582d4ff59e..9a6c27dcd73 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -215,7 +215,7 @@ INCLASS specifies if the cursor is already in CLASS or not."
215 (when (not te) 215 (when (not te)
216 (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag))) 216 (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag)))
217 (goto-char te) 217 (goto-char te)
218 ;; If there is a comment immediatly after aftertag, skip over it. 218 ;; If there is a comment immediately after aftertag, skip over it.
219 (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex)) 219 (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex))
220 (let ((pos (point)) 220 (let ((pos (point))
221 (rnext (semantic-find-tag-by-overlay-next (point)))) 221 (rnext (semantic-find-tag-by-overlay-next (point))))
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 6ca0cefe9a7..bb2db79acc6 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -366,7 +366,7 @@ programming modes."
366 (define-key srecode-prefix-map oldkey nil) 366 (define-key srecode-prefix-map oldkey nil)
367 ))) 367 )))
368 368
369 ;; Update Keybings 369 ;; Update Keybindings
370 (let ((oldbinding (lookup-key srecode-prefix-map binding))) 370 (let ((oldbinding (lookup-key srecode-prefix-map binding)))
371 371
372 ;; During development, allow overrides. 372 ;; During development, allow overrides.