summaryrefslogtreecommitdiff
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-10-02 09:38:24 -0700
committerGlenn Morris <rgm@gnu.org>2020-10-02 09:38:24 -0700
commit726eb835ddcbc209545f681d7272ebaa13788b33 (patch)
tree48a8efe3696f67cdd5c1258bf83b85d39ab949e9 /lisp/textmodes
parentbd080957b069e4ed0e31ce5f029a529432524f46 (diff)
parent78eacf31e8fe182801ad1943fac717b75fcf286b (diff)
downloademacs-726eb835ddcbc209545f681d7272ebaa13788b33.tar.gz
emacs-726eb835ddcbc209545f681d7272ebaa13788b33.tar.bz2
emacs-726eb835ddcbc209545f681d7272ebaa13788b33.zip
Merge from origin/emacs-27
78eacf31e8 ; Fix many typos in symbols in docs and comments d5d12707d6 * doc/misc/flymake.texi (Using Flymake): Fix a typo. (Bug... # Conflicts: # lisp/allout.el # lisp/progmodes/ebrowse.el
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/artist.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 75b13bd7d8e..80682883c85 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -593,7 +593,7 @@ This variable is initialized by the `artist-make-prev-next-op-alist' function.")
(define-key map "\C-c\C-a\C-b" 'artist-submit-bug-report)
(define-key map [menu-bar artist] (cons "Artist" artist-menu-map))
map)
- "Keymap for `artist-minor-mode'.")
+ "Keymap for `artist-mode'.")
(defvar artist-replacement-table (make-vector 256 0)
"Replacement table for `artist-replace-char'.")
@@ -1958,7 +1958,8 @@ Return a list (RETURN-CODE STDOUT STDERR)."
(defsubst artist-get-char-at-xy (x y)
"Return the character found at column X, row Y.
-Also updates the variables `artist-draw-min-y' and `artist-draw-max-y'."
+Also updates the variables `artist-draw-region-min-y' and
+`artist-draw-region-max-y'."
(artist-move-to-xy x y)
(let ((curr-y (artist-current-line)))
(setq artist-draw-region-min-y (min curr-y artist-draw-region-min-y))
@@ -5575,8 +5576,8 @@ The event, EV, is the mouse event."
;; - artist-key-set-point-xxx for setting a point in the
;; mode, to be called from `artist-key-set-point-common'.
;;
-;; - artist-key-do-continuously-xxx to be called from
-;; `artist-key-do-continuously-common' whenever the user
+;; - artist-key-do-continously-xxx to be called from
+;; `artist-key-do-continously-common' whenever the user
;; moves around.
;;
;; As for the artist-mouse-draw-xxx, these two functions must