diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-02 19:22:40 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-02 19:22:40 -0700 |
| commit | f88cd1141101429b2495f8246fb59d986cde0b85 (patch) | |
| tree | 19dabee7150e0bb045d20ce59d90cfbdfb39cb4a /lisp/textmodes/artist.el | |
| parent | 6abfe35f16d4f99bd3f3240e0a2988758f7f5c68 (diff) | |
| download | emacs-f88cd1141101429b2495f8246fb59d986cde0b85.tar.gz | |
* lisp/textmodes/artist.el (artist-replace-char): Drop Emacs 20 code.
Diffstat (limited to 'lisp/textmodes/artist.el')
| -rw-r--r-- | lisp/textmodes/artist.el | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index bca7eed00d2..549b3b3c52a 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1,7 +1,7 @@ ;;; artist.el --- draw ascii graphics with your mouse -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Tomas Abrahamsson <tab@lysator.liu.se> ;; Maintainer: Tomas Abrahamsson <tab@lysator.liu.se> @@ -1957,24 +1957,11 @@ The replacement is used to convert tabs and new-lines to spaces." (defun artist-replace-char (new-char) "Replace the character at point with NEW-CHAR." - ;; Check that the variable exists first. The doc says it was added in 19.23. - (if (and (and (boundp 'emacs-major-version) (= emacs-major-version 20)) - (and (boundp 'emacs-minor-version) (<= emacs-minor-version 3))) - ;; This is a bug workaround for Emacs 20, versions up to 20.3: - ;; The self-insert-command doesn't care about the overwrite-mode, - ;; so the insertion is done in the same way as in picture mode. - ;; This seems to be a little bit slower. - (progn - (artist-move-to-xy (1+ (artist-current-column)) - (artist-current-line)) - (delete-char -1) - (insert (artist-get-replacement-char new-char))) - ;; In emacs-19, the self-insert-command works better and faster - (let ((overwrite-mode 'overwrite-mode-textual) - (fill-column 32765) ; Large :-) - (blink-matching-paren nil)) - (setq last-command-event (artist-get-replacement-char new-char)) - (self-insert-command 1)))) + (let ((overwrite-mode 'overwrite-mode-textual) + (fill-column 32765) ; Large :-) + (blink-matching-paren nil)) + (setq last-command-event (artist-get-replacement-char new-char)) + (self-insert-command 1))) (defun artist-replace-chars (new-char count) "Replace characters at point with NEW-CHAR. COUNT chars are replaced." |