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

[Miles Bader]

Index: emacs/lisp/textmodes/artist.el
diff -c emacs/lisp/textmodes/artist.el:1.11 emacs/lisp/textmodes/artist.el:1.12
*** emacs/lisp/textmodes/artist.el:1.11 Wed Jul  3 10:21:31 2002
--- emacs/lisp/textmodes/artist.el      Fri Oct 18 11:25:48 2002
***************
*** 147,153 ****
  ;;
  ;; 1.2.2      19-Nov-2000
  ;; Changed:   More documentation fixes.
! ;; Bugfix:    The arrow characters (`artist-arrows'), which 
  ;;              got wrong in 1.1, are now corrected.
  ;;
  ;; 1.2.1      15-Nov-2000
--- 147,153 ----
  ;;
  ;; 1.2.2      19-Nov-2000
  ;; Changed:   More documentation fixes.
! ;; Bugfix:    The arrow characters (`artist-arrows'), which
  ;;              got wrong in 1.1, are now corrected.
  ;;
  ;; 1.2.1      15-Nov-2000
***************
*** 202,208 ****
         nil)
       (defmacro defface (var values doc &rest args)
         `(make-face ,var))
!      (defmacro defcustom (var value doc &rest args) 
         `(defvar ,var ,value ,doc))))
  
  ;; User options
--- 202,208 ----
         nil)
       (defmacro defface (var values doc &rest args)
         `(make-face ,var))
!      (defmacro defcustom (var value doc &rest args)
         `(defvar ,var ,value ,doc))))
  
  ;; User options
***************
*** 446,452 ****
    "Char to use when filling.")
  (make-variable-buffer-local 'artist-fill-char)
  
! (defvar artist-erase-char ?\ 
    "Char to use when erasing.")
  (make-variable-buffer-local 'artist-erase-char)
  
--- 446,452 ----
    "Char to use when filling.")
  (make-variable-buffer-local 'artist-fill-char)
  
! (defvar artist-erase-char ?\
    "Char to use when erasing.")
  (make-variable-buffer-local 'artist-erase-char)
  
***************
*** 1766,1772 ****
      (goto-char (point-min))
      (delete-char (- (point-max) (point-min)) nil)))
  
!                    
  (defun artist-system (program stdin &optional program-args)
    "Run PROGRAM synchronously with the contents of string STDIN to stdin.
  Optional args PROGRAM-ARGS are arguments to PROGRAM.
--- 1766,1772 ----
      (goto-char (point-min))
      (delete-char (- (point-max) (point-min)) nil)))
  
! 
  (defun artist-system (program stdin &optional program-args)
    "Run PROGRAM synchronously with the contents of string STDIN to stdin.
  Optional args PROGRAM-ARGS are arguments to PROGRAM.
***************
*** 2849,2855 ****
        (artist-replace-string (car string-list) see-thru)
        (setq string-list (cdr string-list))
        (setq i (1+ i)))))
!                   
  (defun artist-text-insert-see-thru (x y text)
    "At position X, Y, insert text TEXT.
  Let text already in buffer shine thru the TEXT inserted."
--- 2849,2855 ----
        (artist-replace-string (car string-list) see-thru)
        (setq string-list (cdr string-list))
        (setq i (1+ i)))))
! 
  (defun artist-text-insert-see-thru (x y text)
    "At position X, Y, insert text TEXT.
  Let text already in buffer shine thru the TEXT inserted."
***************
*** 2883,2889 ****
  
  ;;
  ;; Spraying
! ;; 
  
  (defun artist-spray-get-interval ()
    "Retrieves the interval for repeated spray."
--- 2883,2889 ----
  
  ;;
  ;; Spraying
! ;;
  
  (defun artist-spray-get-interval ()
    "Retrieves the interval for repeated spray."
***************
*** 3145,3156 ****
  ;;   the entire rectangle is vaporized.
  ;;
  ;;   Now, What if the `+' in the upper left and upper right corners,
! ;;   had not been changed to `|' but to spaces instead? We would 
  ;;   have failed when popping (0,0) and vaporizing that line because
  ;;   we wouldn't find any line at (0,0):
! ;;   
  ;;          0123456
! ;;         0       
  ;;         1|     |
  ;;         2|     |
  ;;         3+-----+
--- 3145,3156 ----
  ;;   the entire rectangle is vaporized.
  ;;
  ;;   Now, What if the `+' in the upper left and upper right corners,
! ;;   had not been changed to `|' but to spaces instead? We would
  ;;   have failed when popping (0,0) and vaporizing that line because
  ;;   we wouldn't find any line at (0,0):
! ;;
  ;;          0123456
! ;;         0
  ;;         1|     |
  ;;         2|     |
  ;;         3+-----+
***************
*** 3663,3671 ****
  
          ;; Last line is empty, don't paint on it, report previous line
          ;; as last line
!         (>= y (- last-line 1)))
!       (>= y last-line))))
! 
  
  (defun artist-flood-fill (x1 y1)
    "Flood-fill starting at X1, Y1. Fill with the char in `artist-fill-char'."
--- 3663,3670 ----
  
          ;; Last line is empty, don't paint on it, report previous line
          ;; as last line
!         (>= y (- last-line 1))
!         (>= y last-line)))))
  
  (defun artist-flood-fill (x1 y1)
    "Flood-fill starting at X1, Y1. Fill with the char in `artist-fill-char'."
***************
*** 4741,4754 ****
          (if (eq window-system 'x)
              (artist-set-pointer-shape artist-pointer-shape))
  
!         ;; Redefine the button-up binding temporarily (the original 
          ;; binding is restored in the unwind-forms below). This is to
          ;; avoid the phenomenon outlined in this scenario:
          ;;
          ;; 1. A routine which reads something from the mini-buffer (such
          ;;    as the text renderer) is called from below.
          ;; 2. Meanwhile, the users releases the mouse button.
!         ;; 3. As a (funny :-) coincidence, the binding for the 
          ;;    button-up event is often mouse-set-point, so Emacs
          ;;    sets the point to where the button was released, which is
          ;;    in the buffer where the user wants to place the text.
--- 4740,4753 ----
          (if (eq window-system 'x)
              (artist-set-pointer-shape artist-pointer-shape))
  
!         ;; Redefine the button-up binding temporarily (the original
          ;; binding is restored in the unwind-forms below). This is to
          ;; avoid the phenomenon outlined in this scenario:
          ;;
          ;; 1. A routine which reads something from the mini-buffer (such
          ;;    as the text renderer) is called from below.
          ;; 2. Meanwhile, the users releases the mouse button.
!         ;; 3. As a (funny :-) coincidence, the binding for the
          ;;    button-up event is often mouse-set-point, so Emacs
          ;;    sets the point to where the button was released, which is
          ;;    in the buffer where the user wants to place the text.