[Emacs-diffs] Changes to emacs/lisp/textmodes/artist.el

[Juanma Barranquero]

Index: emacs/lisp/textmodes/artist.el
diff -c emacs/lisp/textmodes/artist.el:1.22 emacs/lisp/textmodes/artist.el:1.23
*** emacs/lisp/textmodes/artist.el:1.22 Sat Aug  6 17:41:14 2005
--- emacs/lisp/textmodes/artist.el      Wed Aug 31 10:22:34 2005
***************
*** 199,204 ****
--- 199,205 ----
  (defconst artist-version "1.2.6")
  (defconst artist-maintainer-address "address@hidden")
  
+ (defvar x-pointer-crosshair)
  
  (eval-and-compile
   (condition-case ()
***************
*** 404,410 ****
    :type 'integer)
  
  
! (defvar artist-spray-chars '(?\  ?. ?- ?+ ?m ?% ?* ?#)
    ;; This is a defvar, not a defcustom, since the custom
    ;; package shows lists of characters as a lists of integers,
    ;; which is confusing
--- 405,411 ----
    :type 'integer)
  
  
! (defvar artist-spray-chars '(?\s ?. ?- ?+ ?m ?% ?* ?#)
    ;; This is a defvar, not a defcustom, since the custom
    ;; package shows lists of characters as a lists of integers,
    ;; which is confusing
***************
*** 1389,1397 ****
      (while (< i 256)
        (aset artist-replacement-table i i)
        (setq i (1+ i))))
!   (aset artist-replacement-table ?\n ?\ )
!   (aset artist-replacement-table ?\t ?\ )
!   (aset artist-replacement-table 0 ?\ )
    (make-local-variable 'artist-key-is-drawing)
    (make-local-variable 'artist-key-endpoint1)
    (make-local-variable 'artist-key-poly-point-list)
--- 1390,1398 ----
      (while (< i 256)
        (aset artist-replacement-table i i)
        (setq i (1+ i))))
!   (aset artist-replacement-table ?\n ?\s)
!   (aset artist-replacement-table ?\t ?\s)
!   (aset artist-replacement-table 0 ?\s)
    (make-local-variable 'artist-key-is-drawing)
    (make-local-variable 'artist-key-endpoint1)
    (make-local-variable 'artist-key-poly-point-list)
***************
*** 2013,2019 ****
        (blink-matching-paren nil))
      (while char-list
        (let ((c (car char-list)))
!       (if (and see-thru (= (aref artist-replacement-table c) ?\ ))
            (artist-move-to-xy (1+ (artist-current-column))
                               (artist-current-line))
          (artist-replace-char c)))
--- 2014,2020 ----
        (blink-matching-paren nil))
      (while char-list
        (let ((c (car char-list)))
!       (if (and see-thru (= (aref artist-replacement-table c) ?\s))
            (artist-move-to-xy (1+ (artist-current-column))
                               (artist-current-line))
          (artist-replace-char c)))
***************
*** 3069,3094 ****
  (defun artist-vap-find-endpoints-horiz (x y)
    "Find endpoints for a horizontal line through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y  1 0 '(?- ?+) '(?  ))
!       (artist-vap-find-endpoint x y -1 0 '(?- ?+) '(?  ))))
  
  (defun artist-vap-find-endpoints-vert (x y)
    "Find endpoints for a vertical line through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y 0  1 '(?| ?+) '(?  ))
!       (artist-vap-find-endpoint x y 0 -1 '(?| ?+) '(?  ))))
  
  (defun artist-vap-find-endpoints-swne (x y)
    "Find endpoints for a diagonal line (made by /'s) through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y  1 -1 '(?/ ?X) '(?  ))
!       (artist-vap-find-endpoint x y -1  1 '(?/ ?X) '(?  ))))
  
  (defun artist-vap-find-endpoints-nwse (x y)
    "Find endpoints for a diagonal line (made by \\'s) through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y  1  1 '(?\\ ?X) '(?  ))
!       (artist-vap-find-endpoint x y -1 -1 '(?\\ ?X) '(?  ))))
  
  
  (defun artist-vap-find-endpoints (x y)
--- 3070,3095 ----
  (defun artist-vap-find-endpoints-horiz (x y)
    "Find endpoints for a horizontal line through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y  1 0 '(?- ?+) '(?\s))
!       (artist-vap-find-endpoint x y -1 0 '(?- ?+) '(?\s))))
  
  (defun artist-vap-find-endpoints-vert (x y)
    "Find endpoints for a vertical line through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y 0  1 '(?| ?+) '(?\s))
!       (artist-vap-find-endpoint x y 0 -1 '(?| ?+) '(?\s))))
  
  (defun artist-vap-find-endpoints-swne (x y)
    "Find endpoints for a diagonal line (made by /'s) through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y  1 -1 '(?/ ?X) '(?\s))
!       (artist-vap-find-endpoint x y -1  1 '(?/ ?X) '(?\s))))
  
  (defun artist-vap-find-endpoints-nwse (x y)
    "Find endpoints for a diagonal line (made by \\'s) through X, Y.
  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
!   (list (artist-vap-find-endpoint x y  1  1 '(?\\ ?X) '(?\s))
!       (artist-vap-find-endpoint x y -1 -1 '(?\\ ?X) '(?\s))))
  
  
  (defun artist-vap-find-endpoints (x y)
***************
*** 4454,4460 ****
  (defun artist-select-erase-char (c)
    "Set current erase character to be C."
    (interactive "cType char to use when erasing (type RET for normal): ")
!   (cond ((eq c ?\r) (setq artist-erase-char ?\ )
                    (message "Normal erasing"))
        (t          (setq artist-erase-char c)
                    (message "Erasing with \"%c\"" c)))
--- 4455,4461 ----
  (defun artist-select-erase-char (c)
    "Set current erase character to be C."
    (interactive "cType char to use when erasing (type RET for normal): ")
!   (cond ((eq c ?\r) (setq artist-erase-char ?\s)
                    (message "Normal erasing"))
        (t          (setq artist-erase-char c)
                    (message "Erasing with \"%c\"" c)))