Mercurial > emacs
changeset 63948:c51c70065bb1
(artist-key-is-drawing)
(artist-key-endpoint1, artist-key-poly-point-list)
(artist-key-shape, artist-key-draw-how, artist-popup-menu-table)
(artist-key-compl-table, artist-rb-save-data)
(artist-arrow-point-1, artist-arrow-point-2): Move defvars up.
Don't put them in eval-when-compile.
(artist-set-arrow-points-for-poly): Use `last', not `artist-last'.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 03 Jul 2005 16:34:30 +0000 |
| parents | a13c7f436bfa |
| children | 12cb724692d3 |
| files | lisp/textmodes/artist.el |
| diffstat | 1 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/textmodes/artist.el Sun Jul 03 16:32:11 2005 +0000 +++ b/lisp/textmodes/artist.el Sun Jul 03 16:34:30 2005 +0000 @@ -502,7 +502,18 @@ (if artist-picture-compatibility (require 'picture)) - +;; Variables that are made local in artist-mode-init +(defvar artist-key-is-drawing nil) +(defvar artist-key-endpoint1 nil) +(defvar artist-key-poly-point-list nil) +(defvar artist-key-shape nil) +(defvar artist-key-draw-how nil) +(defvar artist-popup-menu-table nil) +(defvar artist-key-compl-table nil) +(defvar artist-rb-save-data nil) +(defvar artist-arrow-point-1 nil) +(defvar artist-arrow-point-2 nil) + (defvar artist-mode-map (let ((map (make-sparse-keymap))) (setq artist-mode-map (make-sparse-keymap)) @@ -1370,21 +1381,6 @@ minor-mode-map-alist))) - -(eval-when-compile - ;; Variables that are made local in artist-mode-init - (defvar artist-key-is-drawing nil) - (defvar artist-key-endpoint1 nil) - (defvar artist-key-poly-point-list nil) - (defvar artist-key-shape nil) - (defvar artist-key-draw-how nil) - (defvar artist-popup-menu-table nil) - (defvar artist-key-compl-table nil) - (defvar artist-rb-save-data nil) - (defvar artist-arrow-point-1 nil) - (defvar artist-arrow-point-2 nil)) - - ;; Init and exit (defun artist-mode-init () "Init Artist mode. This will call the hook `artist-mode-init-hook'." @@ -3850,8 +3846,8 @@ (x2 (artist-endpoint-get-x ep2)) (y2 (artist-endpoint-get-y ep2)) (dir1 (artist-find-direction x2 y2 x1 y1)) - (epn (artist-last point-list)) - (epn-1 (artist-last point-list 2)) + (epn (last point-list)) + (epn-1 (last point-list 2)) (xn (artist-endpoint-get-x epn)) (yn (artist-endpoint-get-y epn)) (xn-1 (artist-endpoint-get-x epn-1))