summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/cc-langs.el2
-rw-r--r--lisp/progmodes/flymake.el2
-rw-r--r--lisp/progmodes/hideshow.el8
-rw-r--r--lisp/progmodes/python.el4
4 files changed, 8 insertions, 8 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 44d0d49df5b..da3fc6b318e 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1416,7 +1416,7 @@ template opener followed by the \"::\" operator - usually."
(c-lang-const c-<-pseudo-digraph-cont-regexp))
(c-lang-defconst c-<-pseudo-digraph-cont-len
- "The maximum length of the main bit of a `c-<pseudp-digraph-cont-regexp' match.
+ "The maximum length of the main bit of a `c-<-pseudo-digraph-cont-regexp' match.
This doesn't count the merely contextual bits of the regexp match."
t 0
c++ 2)
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index f052e002df7..d980d675d4d 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -708,7 +708,7 @@ backend is operating normally.")
"Tell if Flymake has running backends in this buffer."
(flymake-running-backends))
-;; FIXME: clone of `isearch-intesects-p'! Make this an util.
+;; FIXME: clone of `isearch-intersects-p'! Make this an util.
(defun flymake--intersects-p (start0 end0 start1 end1)
"Return t if regions START0..END0 and START1..END1 intersect."
(or (and (>= start0 start1) (< start0 end1))
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 53235ea573b..8f8b79af74b 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -610,7 +610,7 @@ as cdr."
(forward-comment (- (buffer-size)))
(skip-chars-forward " \t\n\f")
(let ((p (point))
- (hidable t))
+ (hideable t))
(beginning-of-line)
(unless (looking-at (concat "[ \t]*" hs-c-start-regexp))
;; we are in this situation: (example)
@@ -636,13 +636,13 @@ as cdr."
(when (or (not (looking-at hs-c-start-regexp))
(> (point) q))
;; we cannot hide this comment block
- (setq hidable nil)))
+ (setq hideable nil)))
;; goto the end of the comment
(forward-comment (buffer-size))
(skip-chars-backward " \t\n\f")
(end-of-line)
(when (>= (point) q)
- (list (and hidable p) (point))))))))
+ (list (and hideable p) (point))))))))
(defun hs-grok-mode-type ()
"Set up hideshow variables for new buffers.
@@ -741,7 +741,7 @@ and `case-fold-search' are both t."
(save-excursion
(let ((c-reg (hs-inside-comment-p)))
(if (and c-reg (nth 0 c-reg))
- ;; point is inside a comment, and that comment is hidable
+ ;; point is inside a comment, and that comment is hideable
(goto-char (nth 0 c-reg))
(end-of-line)
(when (and (not c-reg)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0eed7acd0d7..b0d3174eabc 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3856,8 +3856,8 @@ Returns the tracked buffer."
(defun python-pdbtrack-comint-input-filter-function (input)
"Finish tracking session depending on command in INPUT.
-Commands that must finish tracking session is listed in
-`python-pdbtrack-untracking-commands'."
+Commands that must finish the tracking session are listed in
+`python-pdbtrack-exit-command'."
(when (and python-pdbtrack-tracked-buffer
;; Empty input is sent by C-d or `comint-send-eof'
(or (string-empty-p input)