diff options
| author | Stefan Monnier | 2010-05-24 22:11:08 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-05-24 22:11:08 -0400 |
| commit | d355a0b79173c5d479fed0c7b1b7b81cc652b42c (patch) | |
| tree | 22cf673e1bb9f407d8604ebbf1c441da581cacd5 | |
| parent | f668ef02cbdbb3544702bb58926a443be918a03f (diff) | |
| download | emacs-d355a0b79173c5d479fed0c7b1b7b81cc652b42c.tar.gz emacs-d355a0b79173c5d479fed0c7b1b7b81cc652b42c.zip | |
Replace Lisp calls to delete-backward-char by delete-char.
* bs.el, expand.el, ido.el, image-dired.el, lpr.el, pcomplete.el,
skeleton.el, term.el, time.el, wid-edit.el, woman.el,
calc/calc-graph.el, calc/calc-help.el, calc/calc-incom.el,
calc/calc.el, emacs-cl-extra.el, emacs-cl-loaddefs.el,
emulation/cua-rect.el, emulation/viper-ex.el, eshell/esh-test.el,
eshell/eshell.el, gnus/gnus-uu.el, gnus/nndoc.el, gnus/nnrss.el,
gnus/rfc2047.el, gnus/utf7.el, international/utf-7.el,
language/ethio-util.el, mh-e/mh-alias.el, mh-e/mh-search.el,
net/imap.el, net/rcirc.el, obsolete/complete.el, play/decipher.el,
progmodes/ada-mode.el, progmodes/cc-awk.el, progmodes/dcl-mode.el,
progmodes/ps-mode.el, progmodes/verilog-mode.el,
progmodes/vhdl-mode.el, textmodes/bibtex.el, textmodes/fill.el,
textmodes/reftex-auc.el, textmodes/rst.el, textmodes/sgml-mode.el,
textmodes/table.el, textmodes/texinfmt.el: Replace Lisp calls to
delete-backward-char by calls to delete-char.
48 files changed, 134 insertions, 117 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6bbcc1262b0..cc191632b67 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,22 @@ | |||
| 1 | 2010-05-25 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | Replace Lisp calls to delete-backward-char by delete-char. | ||
| 4 | * bs.el, expand.el, ido.el, image-dired.el, lpr.el, pcomplete.el, | ||
| 5 | skeleton.el, term.el, time.el, wid-edit.el, woman.el, | ||
| 6 | calc/calc-graph.el, calc/calc-help.el, calc/calc-incom.el, | ||
| 7 | calc/calc.el, emacs-cl-extra.el, emacs-cl-loaddefs.el, | ||
| 8 | emulation/cua-rect.el, emulation/viper-ex.el, eshell/esh-test.el, | ||
| 9 | eshell/eshell.el, gnus/gnus-uu.el, gnus/nndoc.el, gnus/nnrss.el, | ||
| 10 | gnus/rfc2047.el, gnus/utf7.el, international/utf-7.el, | ||
| 11 | language/ethio-util.el, mh-e/mh-alias.el, mh-e/mh-search.el, | ||
| 12 | net/imap.el, net/rcirc.el, obsolete/complete.el, play/decipher.el, | ||
| 13 | progmodes/ada-mode.el, progmodes/cc-awk.el, progmodes/dcl-mode.el, | ||
| 14 | progmodes/ps-mode.el, progmodes/verilog-mode.el, | ||
| 15 | progmodes/vhdl-mode.el, textmodes/bibtex.el, textmodes/fill.el, | ||
| 16 | textmodes/reftex-auc.el, textmodes/rst.el, textmodes/sgml-mode.el, | ||
| 17 | textmodes/table.el, textmodes/texinfmt.el: Replace Lisp calls to | ||
| 18 | delete-backward-char by calls to delete-char. | ||
| 19 | |||
| 1 | 2010-05-25 Kenichi Handa <handa@m17n.org> | 20 | 2010-05-25 Kenichi Handa <handa@m17n.org> |
| 2 | 21 | ||
| 3 | * language/hebrew.el (hebrew-shape-gstring): New function. | 22 | * language/hebrew.el (hebrew-shape-gstring): New function. |
diff --git a/lisp/bs.el b/lisp/bs.el index 307b3c4ae9a..3fa91b49178 100644 --- a/lisp/bs.el +++ b/lisp/bs.el | |||
| @@ -1152,7 +1152,7 @@ and move point to current buffer." | |||
| 1152 | (dolist (buffer list) | 1152 | (dolist (buffer list) |
| 1153 | (bs--insert-one-entry buffer) | 1153 | (bs--insert-one-entry buffer) |
| 1154 | (insert "\n")) | 1154 | (insert "\n")) |
| 1155 | (delete-backward-char 1) | 1155 | (delete-char -1) |
| 1156 | (bs--set-window-height) | 1156 | (bs--set-window-height) |
| 1157 | (bs--goto-current-buffer) | 1157 | (bs--goto-current-buffer) |
| 1158 | (font-lock-fontify-buffer) | 1158 | (font-lock-fontify-buffer) |
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index 9af89ab6c3a..9fefaa73d79 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el | |||
| @@ -433,7 +433,7 @@ | |||
| 433 | (while (memq (preceding-char) '(?\s ?\t)) | 433 | (while (memq (preceding-char) '(?\s ?\t)) |
| 434 | (forward-char -1)) | 434 | (forward-char -1)) |
| 435 | (if (eq (preceding-char) ?\,) | 435 | (if (eq (preceding-char) ?\,) |
| 436 | (delete-backward-char 1)))) | 436 | (delete-char -1)))) |
| 437 | (with-current-buffer calcbuf | 437 | (with-current-buffer calcbuf |
| 438 | (setq cache-env (list calc-angle-mode | 438 | (setq cache-env (list calc-angle-mode |
| 439 | calc-complex-mode | 439 | calc-complex-mode |
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el index baae194561a..47c95130641 100644 --- a/lisp/calc/calc-help.el +++ b/lisp/calc/calc-help.el | |||
| @@ -128,7 +128,7 @@ C-w Describe how there is no warranty for Calc." | |||
| 128 | (dig2 (char-after (match-beginning 3)))) | 128 | (dig2 (char-after (match-beginning 3)))) |
| 129 | (delete-region (match-end 1) (match-end 0)) | 129 | (delete-region (match-end 1) (match-end 0)) |
| 130 | (goto-char (match-beginning 1)) | 130 | (goto-char (match-beginning 1)) |
| 131 | (delete-backward-char 1) | 131 | (delete-char -1) |
| 132 | (delete-char 5) | 132 | (delete-char 5) |
| 133 | (insert (format "%c .. %c" (min dig1 dig2) (max dig1 dig2))))) | 133 | (insert (format "%c .. %c" (min dig1 dig2) (max dig1 dig2))))) |
| 134 | (goto-char (point-min))))) | 134 | (goto-char (point-min))))) |
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el index 6244c0d97e1..43811721146 100644 --- a/lisp/calc/calc-incom.el +++ b/lisp/calc/calc-incom.el | |||
| @@ -176,9 +176,9 @@ | |||
| 176 | (defun calc-digit-dots () | 176 | (defun calc-digit-dots () |
| 177 | (if (eq calc-prev-char ?.) | 177 | (if (eq calc-prev-char ?.) |
| 178 | (progn | 178 | (progn |
| 179 | (delete-backward-char 1) | 179 | (delete-char -1) |
| 180 | (if (calc-minibuffer-contains ".*\\.\\'") | 180 | (if (calc-minibuffer-contains ".*\\.\\'") |
| 181 | (delete-backward-char 1)) | 181 | (delete-char -1)) |
| 182 | (setq calc-prev-char 'dots | 182 | (setq calc-prev-char 'dots |
| 183 | last-command-event 32) | 183 | last-command-event 32) |
| 184 | (if calc-prev-prev-char | 184 | (if calc-prev-prev-char |
| @@ -188,7 +188,7 @@ | |||
| 188 | (erase-buffer)) | 188 | (erase-buffer)) |
| 189 | (exit-minibuffer))) | 189 | (exit-minibuffer))) |
| 190 | ;; just ignore extra decimal point, anticipating ".." | 190 | ;; just ignore extra decimal point, anticipating ".." |
| 191 | (delete-backward-char 1))) | 191 | (delete-char -1))) |
| 192 | 192 | ||
| 193 | (defun calc-dots () | 193 | (defun calc-dots () |
| 194 | (interactive) | 194 | (interactive) |
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 73a865cab1a..587e376245b 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el | |||
| @@ -2386,7 +2386,7 @@ See calc-keypad for details." | |||
| 2386 | (progn | 2386 | (progn |
| 2387 | (require 'calc-ext) | 2387 | (require 'calc-ext) |
| 2388 | (calc-digit-dots)) | 2388 | (calc-digit-dots)) |
| 2389 | (delete-backward-char 1) | 2389 | (delete-char -1) |
| 2390 | (beep) | 2390 | (beep) |
| 2391 | (calc-temp-minibuffer-message " [Bad format]")))))) | 2391 | (calc-temp-minibuffer-message " [Bad format]")))))) |
| 2392 | (setq calc-prev-prev-char calc-prev-char | 2392 | (setq calc-prev-prev-char calc-prev-char |
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 3211f79c9e9..c6aae373589 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el | |||
| @@ -685,7 +685,7 @@ PROPLIST is a list of the sort returned by `symbol-plist'. | |||
| 685 | (setq last (point)) | 685 | (setq last (point)) |
| 686 | (goto-char (1+ pt)) | 686 | (goto-char (1+ pt)) |
| 687 | (while (search-forward "(quote " last t) | 687 | (while (search-forward "(quote " last t) |
| 688 | (delete-backward-char 7) | 688 | (delete-char -7) |
| 689 | (insert "'") | 689 | (insert "'") |
| 690 | (forward-sexp) | 690 | (forward-sexp) |
| 691 | (delete-char 1)) | 691 | (delete-char 1)) |
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 1bffcde03d2..325c7b1479f 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | ;;;;;; ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p | 10 | ;;;;;; ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p |
| 11 | ;;;;;; cl-map-overlays cl-map-intervals cl-map-keymap-recursively | 11 | ;;;;;; cl-map-overlays cl-map-intervals cl-map-keymap-recursively |
| 12 | ;;;;;; notevery notany every some mapcon mapcan mapl maplist map | 12 | ;;;;;; notevery notany every some mapcon mapcan mapl maplist map |
| 13 | ;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "d93072a26c59f663a92b10df8bc28187") | 13 | ;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "deb3495d75c36a222e5238eadb8e347c") |
| 14 | ;;; Generated autoloads from cl-extra.el | 14 | ;;; Generated autoloads from cl-extra.el |
| 15 | 15 | ||
| 16 | (autoload 'coerce "cl-extra" "\ | 16 | (autoload 'coerce "cl-extra" "\ |
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 2b41f6435ee..ed3f2d97985 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el | |||
| @@ -1344,7 +1344,7 @@ With prefix arg, indent to that column." | |||
| 1344 | pad) | 1344 | pad) |
| 1345 | (if (bolp) | 1345 | (if (bolp) |
| 1346 | nil | 1346 | nil |
| 1347 | (delete-backward-char 1) | 1347 | (delete-char -1) |
| 1348 | (if (cua--rectangle-right-side t) | 1348 | (if (cua--rectangle-right-side t) |
| 1349 | (cua--rectangle-insert-col (current-column)) | 1349 | (cua--rectangle-insert-col (current-column)) |
| 1350 | (setq indent (- l (current-column)))))) | 1350 | (setq indent (- l (current-column)))))) |
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 5f5c7e86d63..80853fd5680 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el | |||
| @@ -750,7 +750,7 @@ reversed." | |||
| 750 | (format "[^\\\\]\\(\\\\\\\\\\)*\\\\%c" c))) | 750 | (format "[^\\\\]\\(\\\\\\\\\\)*\\\\%c" c))) |
| 751 | (setq cont nil) | 751 | (setq cont nil) |
| 752 | ;; we are at an escaped delimiter: unescape it and continue | 752 | ;; we are at an escaped delimiter: unescape it and continue |
| 753 | (delete-backward-char 2) | 753 | (delete-char -2) |
| 754 | (insert c) | 754 | (insert c) |
| 755 | (if (eolp) | 755 | (if (eolp) |
| 756 | ;; if at eol, exit loop and go to next line | 756 | ;; if at eol, exit loop and go to next line |
diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el index eb448e9704f..5bce6072f0a 100644 --- a/lisp/eshell/esh-test.el +++ b/lisp/eshell/esh-test.el | |||
| @@ -101,7 +101,7 @@ | |||
| 101 | (eshell-redisplay)) | 101 | (eshell-redisplay)) |
| 102 | (let ((truth (eval command))) | 102 | (let ((truth (eval command))) |
| 103 | (with-current-buffer test-buffer | 103 | (with-current-buffer test-buffer |
| 104 | (delete-backward-char 6) | 104 | (delete-char -6) |
| 105 | (insert-before-markers | 105 | (insert-before-markers |
| 106 | "[" (let (str) | 106 | "[" (let (str) |
| 107 | (if truth | 107 | (if truth |
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 74f65d2fe55..89ec3ab9c60 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el | |||
| @@ -404,7 +404,7 @@ With prefix ARG, insert output into the current buffer at point." | |||
| 404 | (assert (not (eshell-interactive-process))) | 404 | (assert (not (eshell-interactive-process))) |
| 405 | (goto-char (point-max)) | 405 | (goto-char (point-max)) |
| 406 | (while (and (bolp) (not (bobp))) | 406 | (while (and (bolp) (not (bobp))) |
| 407 | (delete-backward-char 1))) | 407 | (delete-char -1))) |
| 408 | (assert (and buf (buffer-live-p buf))) | 408 | (assert (and buf (buffer-live-p buf))) |
| 409 | (unless arg | 409 | (unless arg |
| 410 | (let ((len (if (not intr) 2 | 410 | (let ((len (if (not intr) 2 |
diff --git a/lisp/expand.el b/lisp/expand.el index 23fde5f21de..14bc210232c 100644 --- a/lisp/expand.el +++ b/lisp/expand.el | |||
| @@ -368,7 +368,7 @@ See `expand-add-abbrevs'. Value is non-nil if expansion was done." | |||
| 368 | nil)) | 368 | nil)) |
| 369 | 369 | ||
| 370 | (defun expand-do-expansion () | 370 | (defun expand-do-expansion () |
| 371 | (delete-backward-char (length last-abbrev-text)) | 371 | (delete-char (- (length last-abbrev-text))) |
| 372 | (let* ((vect (symbol-value last-abbrev)) | 372 | (let* ((vect (symbol-value last-abbrev)) |
| 373 | (text (aref vect 0)) | 373 | (text (aref vect 0)) |
| 374 | (position (aref vect 1)) | 374 | (position (aref vect 1)) |
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 3cce1e6973a..86cd78cefa3 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el | |||
| @@ -1488,7 +1488,7 @@ When called interactively, prompt for REGEXP." | |||
| 1488 | (when gnus-uu-kill-carriage-return | 1488 | (when gnus-uu-kill-carriage-return |
| 1489 | (save-excursion | 1489 | (save-excursion |
| 1490 | (while (search-forward "\r" nil t) | 1490 | (while (search-forward "\r" nil t) |
| 1491 | (delete-backward-char 1)))) | 1491 | (delete-char -1)))) |
| 1492 | 1492 | ||
| 1493 | (while (or (re-search-forward gnus-uu-begin-string nil t) | 1493 | (while (or (re-search-forward gnus-uu-begin-string nil t) |
| 1494 | (re-search-forward gnus-uu-body-line nil t)) | 1494 | (re-search-forward gnus-uu-body-line nil t)) |
diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el index 981570cc83f..375e300a1eb 100644 --- a/lisp/gnus/nndoc.el +++ b/lisp/gnus/nndoc.el | |||
| @@ -741,7 +741,7 @@ from the document.") | |||
| 741 | (setq p (1+ (nth 3 blk))))) | 741 | (setq p (1+ (nth 3 blk))))) |
| 742 | (goto-char begin) | 742 | (goto-char begin) |
| 743 | (while (re-search-forward "\r$" nil t) | 743 | (while (re-search-forward "\r$" nil t) |
| 744 | (delete-backward-char 1)) | 744 | (delete-char -1)) |
| 745 | (when head | 745 | (when head |
| 746 | (goto-char begin) | 746 | (goto-char begin) |
| 747 | (when (search-forward "\n\n" nil t) | 747 | (when (search-forward "\n\n" nil t) |
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 08b621919eb..db1df33757c 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el | |||
| @@ -682,7 +682,7 @@ which RSS 2.0 allows." | |||
| 682 | (rfc2047-encode-region (point-min) (point-max))) | 682 | (rfc2047-encode-region (point-min) (point-max))) |
| 683 | (goto-char (point-min)) | 683 | (goto-char (point-min)) |
| 684 | (while (search-forward "\n" nil t) | 684 | (while (search-forward "\n" nil t) |
| 685 | (delete-backward-char 1)) | 685 | (delete-char -1)) |
| 686 | (buffer-string))) | 686 | (buffer-string))) |
| 687 | 687 | ||
| 688 | ;;; Snarf functions | 688 | ;;; Snarf functions |
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index e13dffccdac..840b02a26fd 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el | |||
| @@ -427,7 +427,7 @@ Dynamically bind `rfc2047-encoding-type' to change that." | |||
| 427 | ;; since encoded words can't occur in quotes. | 427 | ;; since encoded words can't occur in quotes. |
| 428 | (progn | 428 | (progn |
| 429 | (goto-char end) | 429 | (goto-char end) |
| 430 | (delete-backward-char 1) | 430 | (delete-char -1) |
| 431 | (goto-char start) | 431 | (goto-char start) |
| 432 | (delete-char 1) | 432 | (delete-char 1) |
| 433 | (when last-encoded | 433 | (when last-encoded |
| @@ -897,7 +897,7 @@ them.") | |||
| 897 | (goto-char beg) | 897 | (goto-char beg) |
| 898 | (while (search-forward "\\" nil 'move) | 898 | (while (search-forward "\\" nil 'move) |
| 899 | (unless (memq (char-after) '(?\")) | 899 | (unless (memq (char-after) '(?\")) |
| 900 | (delete-backward-char 1)) | 900 | (delete-char -1)) |
| 901 | (forward-char))) | 901 | (forward-char))) |
| 902 | (forward-char)) | 902 | (forward-char)) |
| 903 | (error | 903 | (error |
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el index ebf01d17b9c..ec8111fe33b 100644 --- a/lisp/gnus/utf7.el +++ b/lisp/gnus/utf7.el | |||
| @@ -112,7 +112,7 @@ Use IMAP modification if FOR-IMAP is non-nil." | |||
| 112 | (skip-chars-forward not-direct-encoding-chars))) | 112 | (skip-chars-forward not-direct-encoding-chars))) |
| 113 | (if (and (= fc esc-char) | 113 | (if (and (= fc esc-char) |
| 114 | (= run-length 1)) ; Lone esc-char? | 114 | (= run-length 1)) ; Lone esc-char? |
| 115 | (delete-backward-char 1) ; Now there's one too many | 115 | (delete-char -1) ; Now there's one too many |
| 116 | (utf7-fragment-encode p (point) for-imap)) | 116 | (utf7-fragment-encode p (point) for-imap)) |
| 117 | (insert "-"))))))) | 117 | (insert "-"))))))) |
| 118 | 118 | ||
| @@ -153,7 +153,7 @@ Use IMAP modification if FOR-IMAP is non-nil." | |||
| 153 | (save-excursion | 153 | (save-excursion |
| 154 | (utf7-fragment-decode p (point) for-imap) | 154 | (utf7-fragment-decode p (point) for-imap) |
| 155 | (goto-char p) | 155 | (goto-char p) |
| 156 | (delete-backward-char 1))))))))) | 156 | (delete-char -1))))))))) |
| 157 | 157 | ||
| 158 | (defun utf7-fragment-decode (start end &optional for-imap) | 158 | (defun utf7-fragment-decode (start end &optional for-imap) |
| 159 | "Decode base64 encoded fragment from START to END of UTF-7 text in buffer. | 159 | "Decode base64 encoded fragment from START to END of UTF-7 text in buffer. |
diff --git a/lisp/ido.el b/lisp/ido.el index f75f02969fd..d34893d708b 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -2815,7 +2815,7 @@ If no buffer or file exactly matching the prompt exists, maybe create a new one. | |||
| 2815 | ((eq this-original-command 'viper-del-backward-char-in-insert) | 2815 | ((eq this-original-command 'viper-del-backward-char-in-insert) |
| 2816 | (funcall this-original-command)) | 2816 | (funcall this-original-command)) |
| 2817 | (t | 2817 | (t |
| 2818 | (delete-backward-char (prefix-numeric-value count))))) | 2818 | (delete-char (- (prefix-numeric-value count)))))) |
| 2819 | 2819 | ||
| 2820 | (defun ido-delete-backward-word-updir (count) | 2820 | (defun ido-delete-backward-word-updir (count) |
| 2821 | "Delete all chars backwards, or at beginning of buffer, go up one level." | 2821 | "Delete all chars backwards, or at beginning of buffer, go up one level." |
diff --git a/lisp/image-dired.el b/lisp/image-dired.el index f006e2e9edd..ce0fc4edc6a 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el | |||
| @@ -937,7 +937,7 @@ FILE-TAGS is an alist in the following form: | |||
| 937 | ;; If on empty line at end of buffer | 937 | ;; If on empty line at end of buffer |
| 938 | (when (and (eobp) | 938 | (when (and (eobp) |
| 939 | (looking-at "^$")) | 939 | (looking-at "^$")) |
| 940 | (delete-backward-char 1)))))) | 940 | (delete-char -1)))))) |
| 941 | files) | 941 | files) |
| 942 | (save-buffer) | 942 | (save-buffer) |
| 943 | (kill-buffer buf)))) | 943 | (kill-buffer buf)))) |
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el index 831ccd391cf..c2cd6346745 100644 --- a/lisp/international/utf-7.el +++ b/lisp/international/utf-7.el | |||
| @@ -62,7 +62,7 @@ IMAP non-nil means use the IMAP version." | |||
| 62 | (decode-coding-region p (point) 'utf-16be) | 62 | (decode-coding-region p (point) 'utf-16be) |
| 63 | (save-excursion | 63 | (save-excursion |
| 64 | (goto-char p) | 64 | (goto-char p) |
| 65 | (delete-backward-char 1))))))) | 65 | (delete-char -1))))))) |
| 66 | (- (point-max) (point-min))))) | 66 | (- (point-max) (point-min))))) |
| 67 | 67 | ||
| 68 | ;;;###autoload | 68 | ;;;###autoload |
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 8d9b2d9f0cd..ee5073d308f 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el | |||
| @@ -869,7 +869,7 @@ Otherwise, [0-9A-F]." | |||
| 869 | (goto-char (point-min)) | 869 | (goto-char (point-min)) |
| 870 | (while (re-search-forward "[ሀ-፼]" nil t) | 870 | (while (re-search-forward "[ሀ-፼]" nil t) |
| 871 | (setq ucode (preceding-char)) | 871 | (setq ucode (preceding-char)) |
| 872 | (delete-backward-char 1) | 872 | (delete-char -1) |
| 873 | (insert | 873 | (insert |
| 874 | (format (if ethio-java-save-lowercase "\\u%4x" "\\u%4X") | 874 | (format (if ethio-java-save-lowercase "\\u%4x" "\\u%4X") |
| 875 | ucode))))) | 875 | ucode))))) |
diff --git a/lisp/lpr.el b/lisp/lpr.el index 51b68c1ab48..559dc5513ae 100644 --- a/lisp/lpr.el +++ b/lisp/lpr.el | |||
| @@ -291,7 +291,7 @@ The characters tab, linefeed, space, return and formfeed are not affected." | |||
| 291 | (let (c) | 291 | (let (c) |
| 292 | (while (re-search-forward "[\^@-\^h\^k\^n-\^_\177-\377]" nil t) | 292 | (while (re-search-forward "[\^@-\^h\^k\^n-\^_\177-\377]" nil t) |
| 293 | (setq c (preceding-char)) | 293 | (setq c (preceding-char)) |
| 294 | (delete-backward-char 1) | 294 | (delete-char -1) |
| 295 | (insert (if (< c ?\s) | 295 | (insert (if (< c ?\s) |
| 296 | (format "\\^%c" (+ c ?@)) | 296 | (format "\\^%c" (+ c ?@)) |
| 297 | (format "\\%02x" c)))))))) | 297 | (format "\\%02x" c)))))))) |
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index 5f472322ff9..2856c630fd0 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el | |||
| @@ -234,7 +234,7 @@ returns the string unchanged if not defined. The same is done here." | |||
| 234 | (let ((user-arg (if user "-user" "-nouser"))) | 234 | (let ((user-arg (if user "-user" "-nouser"))) |
| 235 | (mh-exec-cmd-quiet t "ali" user-arg "-nolist" alias)) | 235 | (mh-exec-cmd-quiet t "ali" user-arg "-nolist" alias)) |
| 236 | (goto-char (point-max)) | 236 | (goto-char (point-max)) |
| 237 | (if (looking-at "^$") (delete-backward-char 1)) | 237 | (if (looking-at "^$") (delete-char -1)) |
| 238 | (buffer-substring (point-min)(point-max))) | 238 | (buffer-substring (point-min)(point-max))) |
| 239 | (error (progn | 239 | (error (progn |
| 240 | (message "%s" (error-message-string err)) | 240 | (message "%s" (error-message-string err)) |
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index f361e049efb..7a1f41bf932 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el | |||
| @@ -1511,7 +1511,7 @@ construct the base name." | |||
| 1511 | (delete-char 1)) | 1511 | (delete-char 1)) |
| 1512 | (goto-char (point-max)) | 1512 | (goto-char (point-max)) |
| 1513 | (while (and (not (bobp)) (memq (char-before) '(? ?\t ?\n ?\r ?_))) | 1513 | (while (and (not (bobp)) (memq (char-before) '(? ?\t ?\n ?\r ?_))) |
| 1514 | (delete-backward-char 1)) | 1514 | (delete-char -1)) |
| 1515 | (subst-char-in-region (point-min) (point-max) ? ?_ t) | 1515 | (subst-char-in-region (point-min) (point-max) ? ?_ t) |
| 1516 | (subst-char-in-region (point-min) (point-max) ?\t ?_ t) | 1516 | (subst-char-in-region (point-min) (point-max) ?\t ?_ t) |
| 1517 | (subst-char-in-region (point-min) (point-max) ?\n ?_ t) | 1517 | (subst-char-in-region (point-min) (point-max) ?\n ?_ t) |
diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 9f1afc53ada..f9c89cd8162 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el | |||
| @@ -2095,7 +2095,7 @@ Return nil if no complete line has arrived." | |||
| 2095 | (while (setq end (imap-find-next-line)) | 2095 | (while (setq end (imap-find-next-line)) |
| 2096 | (save-restriction | 2096 | (save-restriction |
| 2097 | (narrow-to-region (point-min) end) | 2097 | (narrow-to-region (point-min) end) |
| 2098 | (delete-backward-char (length imap-server-eol)) | 2098 | (delete-char (- (length imap-server-eol))) |
| 2099 | (goto-char (point-min)) | 2099 | (goto-char (point-min)) |
| 2100 | (unwind-protect | 2100 | (unwind-protect |
| 2101 | (cond ((eq imap-state 'initial) | 2101 | (cond ((eq imap-state 'initial) |
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 8d70415148f..28ce219fade 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -1067,8 +1067,8 @@ Create the buffer if it doesn't exist." | |||
| 1067 | (goto-char (point-max)) | 1067 | (goto-char (point-max)) |
| 1068 | (when (not (equal 0 (- (point) rcirc-prompt-end-marker))) | 1068 | (when (not (equal 0 (- (point) rcirc-prompt-end-marker))) |
| 1069 | ;; delete a trailing newline | 1069 | ;; delete a trailing newline |
| 1070 | (when (eq (point) (point-at-bol)) | 1070 | (when (bolp) |
| 1071 | (delete-backward-char 1)) | 1071 | (delete-char -1)) |
| 1072 | (let ((input (buffer-substring-no-properties | 1072 | (let ((input (buffer-substring-no-properties |
| 1073 | rcirc-prompt-end-marker (point)))) | 1073 | rcirc-prompt-end-marker (point)))) |
| 1074 | (dolist (line (split-string input "\n")) | 1074 | (dolist (line (split-string input "\n")) |
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el index 99109015875..b7e94743802 100644 --- a/lisp/obsolete/complete.el +++ b/lisp/obsolete/complete.el | |||
| @@ -699,7 +699,7 @@ GOTO-END is non-nil, however, it instead replaces up to END." | |||
| 699 | (if (and (eq mode 'word) | 699 | (if (and (eq mode 'word) |
| 700 | (not PC-word-failed-flag)) | 700 | (not PC-word-failed-flag)) |
| 701 | (let ((PC-word-failed-flag t)) | 701 | (let ((PC-word-failed-flag t)) |
| 702 | (delete-backward-char 1) | 702 | (delete-char -1) |
| 703 | (PC-do-completion 'word)) | 703 | (PC-do-completion 'word)) |
| 704 | (when abbreviated | 704 | (when abbreviated |
| 705 | (delete-region beg end) | 705 | (delete-region beg end) |
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index cf199e69a33..cd216ad8d36 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el | |||
| @@ -553,7 +553,7 @@ completion functions list (it should occur fairly early in the list)." | |||
| 553 | pcomplete-expand-and-complete | 553 | pcomplete-expand-and-complete |
| 554 | pcomplete-reverse))) | 554 | pcomplete-reverse))) |
| 555 | (progn | 555 | (progn |
| 556 | (delete-backward-char pcomplete-last-completion-length) | 556 | (delete-char (- pcomplete-last-completion-length)) |
| 557 | (if (eq this-command 'pcomplete-reverse) | 557 | (if (eq this-command 'pcomplete-reverse) |
| 558 | (progn | 558 | (progn |
| 559 | (push (car (last pcomplete-current-completions)) | 559 | (push (car (last pcomplete-current-completions)) |
| @@ -616,7 +616,7 @@ This will modify the current buffer." | |||
| 616 | (pcomplete) | 616 | (pcomplete) |
| 617 | (when (and pcomplete-current-completions | 617 | (when (and pcomplete-current-completions |
| 618 | (> (length pcomplete-current-completions) 0)) ;?? | 618 | (> (length pcomplete-current-completions) 0)) ;?? |
| 619 | (delete-backward-char pcomplete-last-completion-length) | 619 | (delete-char (- pcomplete-last-completion-length)) |
| 620 | (while pcomplete-current-completions | 620 | (while pcomplete-current-completions |
| 621 | (unless (pcomplete-insert-entry | 621 | (unless (pcomplete-insert-entry |
| 622 | "" (car pcomplete-current-completions) t | 622 | "" (car pcomplete-current-completions) t |
| @@ -639,7 +639,7 @@ This will modify the current buffer." | |||
| 639 | (when (and pcomplete-cycle-completions | 639 | (when (and pcomplete-cycle-completions |
| 640 | pcomplete-current-completions | 640 | pcomplete-current-completions |
| 641 | (eq last-command 'pcomplete-argument)) | 641 | (eq last-command 'pcomplete-argument)) |
| 642 | (delete-backward-char pcomplete-last-completion-length) | 642 | (delete-char (- pcomplete-last-completion-length)) |
| 643 | (setq pcomplete-current-completions nil | 643 | (setq pcomplete-current-completions nil |
| 644 | pcomplete-last-completion-raw nil)) | 644 | pcomplete-last-completion-raw nil)) |
| 645 | (let ((pcomplete-show-list t)) | 645 | (let ((pcomplete-show-list t)) |
| @@ -1207,7 +1207,7 @@ Returns non-nil if a space was appended at the end." | |||
| 1207 | ;; FIXME: Here we presume that quoting `stub' gives us the exact | 1207 | ;; FIXME: Here we presume that quoting `stub' gives us the exact |
| 1208 | ;; text in the buffer before point, which is not guaranteed; | 1208 | ;; text in the buffer before point, which is not guaranteed; |
| 1209 | ;; e.g. it is not the case in eshell when completing ${FOO}tm[TAB]. | 1209 | ;; e.g. it is not the case in eshell when completing ${FOO}tm[TAB]. |
| 1210 | (delete-backward-char (length (pcomplete-quote-argument stub))) | 1210 | (delete-char (- (length (pcomplete-quote-argument stub)))) |
| 1211 | ;; if there is already a backslash present to handle the first | 1211 | ;; if there is already a backslash present to handle the first |
| 1212 | ;; character, don't bother quoting it | 1212 | ;; character, don't bother quoting it |
| 1213 | (when (eq (char-before) ?\\) | 1213 | (when (eq (char-before) ?\\) |
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index 897832d2195..83186c42442 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el | |||
| @@ -1060,7 +1060,7 @@ if it can't, it signals an error." | |||
| 1060 | ;; (insert ?\() | 1060 | ;; (insert ?\() |
| 1061 | ;; (while (setq undo-map (pop undo-rec)) | 1061 | ;; (while (setq undo-map (pop undo-rec)) |
| 1062 | ;; (insert (cdr undo-map) (car undo-map) ?\ )) | 1062 | ;; (insert (cdr undo-map) (car undo-map) ?\ )) |
| 1063 | ;; (delete-backward-char 1) | 1063 | ;; (delete-char -1) |
| 1064 | ;; (insert ")\n")))))) | 1064 | ;; (insert ")\n")))))) |
| 1065 | 1065 | ||
| 1066 | ;; arch-tag: 8f094d88-ffe1-4f99-afe3-a5e81dd939d9 | 1066 | ;; arch-tag: 8f094d88-ffe1-4f99-afe3-a5e81dd939d9 |
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 95f9f6babf3..227f202fef0 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el | |||
| @@ -1645,7 +1645,7 @@ ARG is the prefix the user entered with \\[universal-argument]." | |||
| 1645 | (insert " ") | 1645 | (insert " ") |
| 1646 | (ada-adjust-case) | 1646 | (ada-adjust-case) |
| 1647 | ;; horrible dekludge | 1647 | ;; horrible dekludge |
| 1648 | (delete-backward-char 1) | 1648 | (delete-char -1) |
| 1649 | ;; some special keys and their bindings | 1649 | ;; some special keys and their bindings |
| 1650 | (cond | 1650 | (cond |
| 1651 | ((eq lastk ?\n) | 1651 | ((eq lastk ?\n) |
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 25dc27a08ea..be7d2a0fd3e 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el | |||
| @@ -244,7 +244,7 @@ | |||
| 244 | 244 | ||
| 245 | ;; REGEXPS USED FOR FINDING THE POSITION OF A "virtual semicolon" | 245 | ;; REGEXPS USED FOR FINDING THE POSITION OF A "virtual semicolon" |
| 246 | (defconst c-awk-_-harmless-nonws-char-re "[^#/\"\\\\\n\r \t]") | 246 | (defconst c-awk-_-harmless-nonws-char-re "[^#/\"\\\\\n\r \t]") |
| 247 | ;;;; NEW VERSION! (which will be restricted to the current line) | 247 | ;; NEW VERSION! (which will be restricted to the current line) |
| 248 | (defconst c-awk-one-line-non-syn-ws*-re | 248 | (defconst c-awk-one-line-non-syn-ws*-re |
| 249 | (concat "\\([ \t]*" | 249 | (concat "\\([ \t]*" |
| 250 | "\\(" c-awk-_-harmless-nonws-char-re "\\|" | 250 | "\\(" c-awk-_-harmless-nonws-char-re "\\|" |
| @@ -503,7 +503,7 @@ | |||
| 503 | (insert-char ?\n 1) ; ...artificial eol is needed for comment detection. | 503 | (insert-char ?\n 1) ; ...artificial eol is needed for comment detection. |
| 504 | (setq extra-nl t)) | 504 | (setq extra-nl t)) |
| 505 | (prog1 (c-awk-get-NL-prop-prev-line do-lim) | 505 | (prog1 (c-awk-get-NL-prop-prev-line do-lim) |
| 506 | (if extra-nl (delete-backward-char 1)))))) | 506 | (if extra-nl (delete-char -1)))))) |
| 507 | 507 | ||
| 508 | (defsubst c-awk-prev-line-incomplete-p (&optional do-lim) | 508 | (defsubst c-awk-prev-line-incomplete-p (&optional do-lim) |
| 509 | ;; Is there an incomplete statement at the end of the previous line? | 509 | ;; Is there an incomplete statement at the end of the previous line? |
| @@ -519,14 +519,14 @@ | |||
| 519 | ;; This function might do hidden buffer changes. | 519 | ;; This function might do hidden buffer changes. |
| 520 | (memq (c-awk-get-NL-prop-cur-line do-lim) '(?\\ ?\{))) | 520 | (memq (c-awk-get-NL-prop-cur-line do-lim) '(?\\ ?\{))) |
| 521 | 521 | ||
| 522 | ;;;; NOTES ON "VIRTUAL SEMICOLONS" | 522 | ;; NOTES ON "VIRTUAL SEMICOLONS" |
| 523 | ;;;; | 523 | ;; |
| 524 | ;;;; A "virtual semicolon" is what terminates a statement when there is no ; | 524 | ;; A "virtual semicolon" is what terminates a statement when there is no ; |
| 525 | ;;;; or } to do the job. Like point, it is considered to lie _between_ two | 525 | ;; or } to do the job. Like point, it is considered to lie _between_ two |
| 526 | ;;;; characters. As from mid-March 2004, it is considered to lie just after | 526 | ;; characters. As from mid-March 2004, it is considered to lie just after |
| 527 | ;;;; the last non-syntactic-whitespace character on the line; (previously, it | 527 | ;; the last non-syntactic-whitespace character on the line; (previously, it |
| 528 | ;;;; was considered an attribute of the EOL on the line). A real semicolon | 528 | ;; was considered an attribute of the EOL on the line). A real semicolon |
| 529 | ;;;; never counts as a virtual one. | 529 | ;; never counts as a virtual one. |
| 530 | 530 | ||
| 531 | (defun c-awk-at-vsemi-p (&optional pos) | 531 | (defun c-awk-at-vsemi-p (&optional pos) |
| 532 | ;; Is there a virtual semicolon at POS (or POINT)? | 532 | ;; Is there a virtual semicolon at POS (or POINT)? |
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index 04a04184ed2..ead8b5db38f 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el | |||
| @@ -1549,13 +1549,11 @@ Also remove the continuation mark if easily detected." | |||
| 1549 | (interactive "*P") | 1549 | (interactive "*P") |
| 1550 | (delete-indentation arg) | 1550 | (delete-indentation arg) |
| 1551 | (let ((type (dcl-get-line-type))) | 1551 | (let ((type (dcl-get-line-type))) |
| 1552 | (if (and (or (equal type '$) | 1552 | (if (and (member type '($ - empty-$)) |
| 1553 | (equal type '-) | ||
| 1554 | (equal type 'empty-$)) | ||
| 1555 | (not (bobp)) | 1553 | (not (bobp)) |
| 1556 | (= (char-after (1- (point))) ?-)) | 1554 | (= (char-before) ?-)) |
| 1557 | (progn | 1555 | (progn |
| 1558 | (delete-backward-char 1) | 1556 | (delete-char -1) |
| 1559 | (fixup-whitespace))))) | 1557 | (fixup-whitespace))))) |
| 1560 | 1558 | ||
| 1561 | 1559 | ||
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 93a559258fa..7b235bc3b68 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el | |||
| @@ -681,7 +681,7 @@ defines the beginning of a group. These tokens are: { [ <<" | |||
| 681 | (if (or (not ps-mode-auto-indent) | 681 | (if (or (not ps-mode-auto-indent) |
| 682 | (< ps-mode-tab 1) | 682 | (< ps-mode-tab 1) |
| 683 | (not (re-search-backward "^[ \t]+\\=" nil t))) | 683 | (not (re-search-backward "^[ \t]+\\=" nil t))) |
| 684 | (delete-backward-char 1) | 684 | (call-interactively 'delete-backward-char) |
| 685 | (setq target (ps-mode-target-column)) | 685 | (setq target (ps-mode-target-column)) |
| 686 | (while (> column target) | 686 | (while (> column target) |
| 687 | (setq target (+ target ps-mode-tab))) | 687 | (setq target (+ target ps-mode-tab))) |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 1ec5ab90ac7..bf9d4b8da47 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el | |||
| @@ -9305,11 +9305,11 @@ For more information see the \\[verilog-faq] and forums at URL | |||
| 9305 | (delete-char 1) | 9305 | (delete-char 1) |
| 9306 | (insert ");") | 9306 | (insert ");") |
| 9307 | (search-forward "\n") ;; Added by inst-port | 9307 | (search-forward "\n") ;; Added by inst-port |
| 9308 | (delete-backward-char 1) | 9308 | (delete-char -1) |
| 9309 | (if (search-forward ")" nil t) ;; From user, moved up a line | 9309 | (if (search-forward ")" nil t) ;; From user, moved up a line |
| 9310 | (delete-backward-char 1)) | 9310 | (delete-char -1)) |
| 9311 | (if (search-forward ";" nil t) ;; Don't error if user had syntax error and forgot it | 9311 | (if (search-forward ";" nil t) ;; Don't error if user had syntax error and forgot it |
| 9312 | (delete-backward-char 1))))))))) | 9312 | (delete-char -1))))))))) |
| 9313 | 9313 | ||
| 9314 | (defun verilog-auto-inst-param () | 9314 | (defun verilog-auto-inst-param () |
| 9315 | "Expand AUTOINSTPARAM statements, as part of \\[verilog-auto]. | 9315 | "Expand AUTOINSTPARAM statements, as part of \\[verilog-auto]. |
| @@ -9412,9 +9412,9 @@ Templates: | |||
| 9412 | (delete-char 1) | 9412 | (delete-char 1) |
| 9413 | (insert ")") | 9413 | (insert ")") |
| 9414 | (search-forward "\n") ;; Added by inst-port | 9414 | (search-forward "\n") ;; Added by inst-port |
| 9415 | (delete-backward-char 1) | 9415 | (delete-char -1) |
| 9416 | (if (search-forward ")" nil t) ;; From user, moved up a line | 9416 | (if (search-forward ")" nil t) ;; From user, moved up a line |
| 9417 | (delete-backward-char 1))))))))) | 9417 | (delete-char -1))))))))) |
| 9418 | 9418 | ||
| 9419 | (defun verilog-auto-reg () | 9419 | (defun verilog-auto-reg () |
| 9420 | "Expand AUTOREG statements, as part of \\[verilog-auto]. | 9420 | "Expand AUTOREG statements, as part of \\[verilog-auto]. |
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index e0c8ee404a6..4ff9cf92b8d 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el | |||
| @@ -7994,7 +7994,7 @@ buffer." | |||
| 7994 | (condition-case () (forward-sexp) | 7994 | (condition-case () (forward-sexp) |
| 7995 | (error (goto-char (point-max)))) | 7995 | (error (goto-char (point-max)))) |
| 7996 | (< (point) end)) | 7996 | (< (point) end)) |
| 7997 | (delete-backward-char 1)) | 7997 | (delete-char -1)) |
| 7998 | ;; add closing parenthesis | 7998 | ;; add closing parenthesis |
| 7999 | (when (> (point) end) | 7999 | (when (> (point) end) |
| 8000 | (goto-char end) | 8000 | (goto-char end) |
| @@ -8105,7 +8105,7 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil." | |||
| 8105 | (interactive "p") | 8105 | (interactive "p") |
| 8106 | (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal))) | 8106 | (if (and vhdl-stutter-mode (= count 1) (not (vhdl-in-literal))) |
| 8107 | (if (= (preceding-char) last-input-event) | 8107 | (if (= (preceding-char) last-input-event) |
| 8108 | (progn (delete-backward-char 1) (insert-char ?\" 1)) | 8108 | (progn (delete-char -1) (insert-char ?\" 1)) |
| 8109 | (insert-char ?\' 1)) | 8109 | (insert-char ?\' 1)) |
| 8110 | (self-insert-command count))) | 8110 | (self-insert-command count))) |
| 8111 | 8111 | ||
| @@ -8172,7 +8172,7 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil." | |||
| 8172 | (unless (vhdl-template-field | 8172 | (unless (vhdl-template-field |
| 8173 | (concat "[type" (and (vhdl-standard-p 'ams) " or nature") "]") | 8173 | (concat "[type" (and (vhdl-standard-p 'ams) " or nature") "]") |
| 8174 | nil t) | 8174 | nil t) |
| 8175 | (delete-backward-char 3)) | 8175 | (delete-char -3)) |
| 8176 | (vhdl-insert-keyword " IS ") | 8176 | (vhdl-insert-keyword " IS ") |
| 8177 | (vhdl-template-field "name" ";") | 8177 | (vhdl-template-field "name" ";") |
| 8178 | (vhdl-comment-insert-inline)))) | 8178 | (vhdl-comment-insert-inline)))) |
| @@ -8536,7 +8536,7 @@ a configuration declaration if not within a design unit." | |||
| 8536 | (vhdl-template-field "library name" "." nil nil nil nil | 8536 | (vhdl-template-field "library name" "." nil nil nil nil |
| 8537 | (vhdl-work-library)) | 8537 | (vhdl-work-library)) |
| 8538 | (vhdl-template-field "configuration name" ";")) | 8538 | (vhdl-template-field "configuration name" ";")) |
| 8539 | (t (delete-backward-char 1) (insert ";") t)))))) | 8539 | (t (delete-char -1) (insert ";") t)))))) |
| 8540 | 8540 | ||
| 8541 | 8541 | ||
| 8542 | (defun vhdl-template-configuration-decl () | 8542 | (defun vhdl-template-configuration-decl () |
| @@ -8703,7 +8703,7 @@ a configuration declaration if not within a design unit." | |||
| 8703 | (vhdl-insert-keyword " OPEN ") | 8703 | (vhdl-insert-keyword " OPEN ") |
| 8704 | (unless (vhdl-template-field "[READ_MODE | WRITE_MODE | APPEND_MODE]" | 8704 | (unless (vhdl-template-field "[READ_MODE | WRITE_MODE | APPEND_MODE]" |
| 8705 | nil t) | 8705 | nil t) |
| 8706 | (delete-backward-char 6))) | 8706 | (delete-char -6))) |
| 8707 | (vhdl-insert-keyword " IS ") | 8707 | (vhdl-insert-keyword " IS ") |
| 8708 | (when (vhdl-standard-p '87) | 8708 | (when (vhdl-standard-p '87) |
| 8709 | (vhdl-template-field "[IN | OUT]" " " t)) | 8709 | (vhdl-template-field "[IN | OUT]" " " t)) |
| @@ -9031,7 +9031,7 @@ otherwise." | |||
| 9031 | (insert "\n") | 9031 | (insert "\n") |
| 9032 | (indent-to margin)) | 9032 | (indent-to margin)) |
| 9033 | (delete-region end-pos (point)) | 9033 | (delete-region end-pos (point)) |
| 9034 | (delete-backward-char 1) | 9034 | (delete-char -1) |
| 9035 | (insert ")") | 9035 | (insert ")") |
| 9036 | (when vhdl-auto-align (vhdl-align-region-groups start (point) 1)) | 9036 | (when vhdl-auto-align (vhdl-align-region-groups start (point) 1)) |
| 9037 | t) | 9037 | t) |
| @@ -9405,7 +9405,7 @@ otherwise." | |||
| 9405 | (vhdl-insert-keyword "REPORT ") | 9405 | (vhdl-insert-keyword "REPORT ") |
| 9406 | (if (equal "\"\"" (vhdl-template-field | 9406 | (if (equal "\"\"" (vhdl-template-field |
| 9407 | "string expression" nil t start (point) t)) | 9407 | "string expression" nil t start (point) t)) |
| 9408 | (delete-backward-char 2) | 9408 | (delete-char -2) |
| 9409 | (setq start (point)) | 9409 | (setq start (point)) |
| 9410 | (vhdl-insert-keyword " SEVERITY ") | 9410 | (vhdl-insert-keyword " SEVERITY ") |
| 9411 | (unless (vhdl-template-field "[NOTE | WARNING | ERROR | FAILURE]" nil t) | 9411 | (unless (vhdl-template-field "[NOTE | WARNING | ERROR | FAILURE]" nil t) |
| @@ -9553,7 +9553,7 @@ otherwise." | |||
| 9553 | "[scalar type | ARRAY | RECORD | ACCESS | FILE]" nil t) | 9553 | "[scalar type | ARRAY | RECORD | ACCESS | FILE]" nil t) |
| 9554 | "")))) | 9554 | "")))) |
| 9555 | (cond ((equal definition "") | 9555 | (cond ((equal definition "") |
| 9556 | (delete-backward-char 4) | 9556 | (delete-char -4) |
| 9557 | (insert ";")) | 9557 | (insert ";")) |
| 9558 | ((equal definition "ARRAY") | 9558 | ((equal definition "ARRAY") |
| 9559 | (delete-region (point) (progn (forward-word -1) (point))) | 9559 | (delete-region (point) (progn (forward-word -1) (point))) |
| @@ -10053,13 +10053,13 @@ If starting after end-comment-column, start a new line." | |||
| 10053 | (if (not (or (and string (progn (insert string) t)) | 10053 | (if (not (or (and string (progn (insert string) t)) |
| 10054 | (vhdl-template-field "[comment]" nil t))) | 10054 | (vhdl-template-field "[comment]" nil t))) |
| 10055 | (delete-region position (point)) | 10055 | (delete-region position (point)) |
| 10056 | (while (= (preceding-char) ? ) (delete-backward-char 1)) | 10056 | (while (= (preceding-char) ?\ ) (delete-char -1)) |
| 10057 | ; (when (> (current-column) end-comment-column) | 10057 | ;; (when (> (current-column) end-comment-column) |
| 10058 | ; (setq position (point-marker)) | 10058 | ;; (setq position (point-marker)) |
| 10059 | ; (re-search-backward "-- ") | 10059 | ;; (re-search-backward "-- ") |
| 10060 | ; (insert "\n") | 10060 | ;; (insert "\n") |
| 10061 | ; (indent-to comment-column) | 10061 | ;; (indent-to comment-column) |
| 10062 | ; (goto-char position)) | 10062 | ;; (goto-char position)) |
| 10063 | )))) | 10063 | )))) |
| 10064 | 10064 | ||
| 10065 | (defun vhdl-comment-block () | 10065 | (defun vhdl-comment-block () |
| @@ -10192,7 +10192,7 @@ Point is left between them." | |||
| 10192 | (when semicolon-pos (goto-char semicolon-pos)) | 10192 | (when semicolon-pos (goto-char semicolon-pos)) |
| 10193 | (if not-empty | 10193 | (if not-empty |
| 10194 | (progn (delete-char 1) (insert ")")) | 10194 | (progn (delete-char 1) (insert ")")) |
| 10195 | (delete-backward-char 2)))) | 10195 | (delete-char -2)))) |
| 10196 | 10196 | ||
| 10197 | (defun vhdl-template-generic-list (optional &optional no-value) | 10197 | (defun vhdl-template-generic-list (optional &optional no-value) |
| 10198 | "Read from user a generic spec argument list." | 10198 | "Read from user a generic spec argument list." |
diff --git a/lisp/skeleton.el b/lisp/skeleton.el index b228b5031b2..28798b1a3b2 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el | |||
| @@ -358,7 +358,7 @@ automatically, and you are prompted to fill in the variable parts."))) | |||
| 358 | (< element 0)) | 358 | (< element 0)) |
| 359 | (if skeleton-untabify | 359 | (if skeleton-untabify |
| 360 | (backward-delete-char-untabify (- element)) | 360 | (backward-delete-char-untabify (- element)) |
| 361 | (delete-backward-char (- element))) | 361 | (delete-char element)) |
| 362 | (insert (if (not literal) | 362 | (insert (if (not literal) |
| 363 | (funcall skeleton-transformation-function element) | 363 | (funcall skeleton-transformation-function element) |
| 364 | element)))) | 364 | element)))) |
diff --git a/lisp/term.el b/lisp/term.el index 7cb364af622..ea6c48a2b2a 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -1170,7 +1170,7 @@ Entry to this mode runs the hooks on `term-mode-hook'." | |||
| 1170 | (let* ((str (car cur)) (len (length str)) (start (- (point) len))) | 1170 | (let* ((str (car cur)) (len (length str)) (start (- (point) len))) |
| 1171 | (if (and (>= start (point-min)) | 1171 | (if (and (>= start (point-min)) |
| 1172 | (string= str (buffer-substring start (point)))) | 1172 | (string= str (buffer-substring start (point)))) |
| 1173 | (progn (delete-backward-char len) | 1173 | (progn (delete-char (- len)) |
| 1174 | (setq term-kill-echo-list (cdr cur)) | 1174 | (setq term-kill-echo-list (cdr cur)) |
| 1175 | (setq term-current-column nil) | 1175 | (setq term-current-column nil) |
| 1176 | (setq term-current-row nil) | 1176 | (setq term-current-row nil) |
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index ac7a2e48a15..e17cd9e5b28 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el | |||
| @@ -2094,7 +2094,7 @@ Formats current entry according to variable `bibtex-entry-format'." | |||
| 2094 | ;; if match not at left subfield boundary... | 2094 | ;; if match not at left subfield boundary... |
| 2095 | (if (< (1+ (nth 1 bounds)) (match-beginning 0)) | 2095 | (if (< (1+ (nth 1 bounds)) (match-beginning 0)) |
| 2096 | (insert (bibtex-field-right-delimiter) " # ") | 2096 | (insert (bibtex-field-right-delimiter) " # ") |
| 2097 | (delete-backward-char 1)))))))) | 2097 | (delete-char -1)))))))) |
| 2098 | 2098 | ||
| 2099 | ;; use book title of crossref'd entry | 2099 | ;; use book title of crossref'd entry |
| 2100 | (if (and (memq 'inherit-booktitle format) | 2100 | (if (and (memq 'inherit-booktitle format) |
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index da6e02bfa2f..605f3f8c101 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el | |||
| @@ -657,7 +657,7 @@ space does not end a sentence, so don't break a line there." | |||
| 657 | (if (and oneleft | 657 | (if (and oneleft |
| 658 | (not (and use-hard-newlines | 658 | (not (and use-hard-newlines |
| 659 | (get-text-property (1- (point)) 'hard)))) | 659 | (get-text-property (1- (point)) 'hard)))) |
| 660 | (delete-backward-char 1) | 660 | (delete-char -1) |
| 661 | (backward-char 1) | 661 | (backward-char 1) |
| 662 | (setq oneleft t))) | 662 | (setq oneleft t))) |
| 663 | (setq to (copy-marker (point) t)) | 663 | (setq to (copy-marker (point) t)) |
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el index 498148f0de4..374ac990cc6 100644 --- a/lisp/textmodes/reftex-auc.el +++ b/lisp/textmodes/reftex-auc.el | |||
| @@ -58,7 +58,7 @@ What is being used depends upon `reftex-plug-into-AUCTeX'." | |||
| 58 | ;; Create a new label, with a temporary brace for `reftex-what-macro' | 58 | ;; Create a new label, with a temporary brace for `reftex-what-macro' |
| 59 | (unwind-protect | 59 | (unwind-protect |
| 60 | (progn (insert "{") (setq label (or (reftex-label nil t) ""))) | 60 | (progn (insert "{") (setq label (or (reftex-label nil t) ""))) |
| 61 | (delete-backward-char 1))) | 61 | (delete-char -1))) |
| 62 | ((and (not definition) (reftex-plug-flag 2)) | 62 | ((and (not definition) (reftex-plug-flag 2)) |
| 63 | ;; Reference a label with RefTeX | 63 | ;; Reference a label with RefTeX |
| 64 | (setq label (reftex-reference nil t))) | 64 | (setq label (reftex-reference nil t))) |
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index b9a5098b05c..fd3148d3f12 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el | |||
| @@ -1787,7 +1787,7 @@ The TOC is inserted indented at the current column." | |||
| 1787 | (delete-region init-point (+ init-point (length initial-indent))) | 1787 | (delete-region init-point (+ init-point (length initial-indent))) |
| 1788 | 1788 | ||
| 1789 | ;; Delete the last newline added. | 1789 | ;; Delete the last newline added. |
| 1790 | (delete-backward-char 1) | 1790 | (delete-char -1) |
| 1791 | ))) | 1791 | ))) |
| 1792 | 1792 | ||
| 1793 | (defun rst-toc-insert-node (node level indent pfx) | 1793 | (defun rst-toc-insert-node (node level indent pfx) |
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 6cd4121bd10..87ffecd5d5a 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el | |||
| @@ -526,7 +526,7 @@ Behaves electrically if `sgml-quick-keys' is non-nil." | |||
| 526 | (insert-char ?/ 1) | 526 | (insert-char ?/ 1) |
| 527 | (indent-according-to-mode)) | 527 | (indent-according-to-mode)) |
| 528 | ((eq sgml-quick-keys 'close) | 528 | ((eq sgml-quick-keys 'close) |
| 529 | (delete-backward-char 1) | 529 | (delete-char -1) |
| 530 | (sgml-close-tag)) | 530 | (sgml-close-tag)) |
| 531 | (t | 531 | (t |
| 532 | (sgml-slash-matching arg)))) | 532 | (sgml-slash-matching arg)))) |
| @@ -583,7 +583,7 @@ encoded keyboard operation." | |||
| 583 | (insert ?&) | 583 | (insert ?&) |
| 584 | (or char | 584 | (or char |
| 585 | (setq char (read-quoted-char "Enter char or octal number"))) | 585 | (setq char (read-quoted-char "Enter char or octal number"))) |
| 586 | (delete-backward-char 1) | 586 | (delete-char -1) |
| 587 | (insert char) | 587 | (insert char) |
| 588 | (undo-boundary) | 588 | (undo-boundary) |
| 589 | (sgml-namify-char)) | 589 | (sgml-namify-char)) |
| @@ -601,7 +601,7 @@ Uses `sgml-char-names'." | |||
| 601 | ((encode-char char 'ucs))))) | 601 | ((encode-char char 'ucs))))) |
| 602 | (if (not name) | 602 | (if (not name) |
| 603 | (error "Don't know the name of `%c'" char) | 603 | (error "Don't know the name of `%c'" char) |
| 604 | (delete-backward-char 1) | 604 | (delete-char -1) |
| 605 | (insert (format (if (numberp name) "&#%d;" "&%s;") name))))) | 605 | (insert (format (if (numberp name) "&#%d;" "&%s;") name))))) |
| 606 | 606 | ||
| 607 | (defun sgml-name-self () | 607 | (defun sgml-name-self () |
| @@ -707,7 +707,7 @@ If QUIET, do not print a message when there are no attributes for TAG." | |||
| 707 | (sgml-value (assoc (downcase attribute) alist)) | 707 | (sgml-value (assoc (downcase attribute) alist)) |
| 708 | (setq i (1- i)))) | 708 | (setq i (1- i)))) |
| 709 | (if (eq (preceding-char) ?\s) | 709 | (if (eq (preceding-char) ?\s) |
| 710 | (delete-backward-char 1))) | 710 | (delete-char -1))) |
| 711 | car))) | 711 | car))) |
| 712 | 712 | ||
| 713 | (defun sgml-auto-attributes (arg) | 713 | (defun sgml-auto-attributes (arg) |
| @@ -1117,7 +1117,7 @@ See `sgml-tag-alist' for info about attribute rules." | |||
| 1117 | (setq alist (skeleton-read '(completing-read "Value: " (cdr alist)))) | 1117 | (setq alist (skeleton-read '(completing-read "Value: " (cdr alist)))) |
| 1118 | (if (string< "" alist) | 1118 | (if (string< "" alist) |
| 1119 | (insert alist ?\") | 1119 | (insert alist ?\") |
| 1120 | (delete-backward-char 2))) | 1120 | (delete-char -2))) |
| 1121 | (insert "=\"") | 1121 | (insert "=\"") |
| 1122 | (if (cdr alist) | 1122 | (if (cdr alist) |
| 1123 | (insert (skeleton-read '(completing-read "Value: " alist))) | 1123 | (insert (skeleton-read '(completing-read "Value: " alist))) |
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 3e092374207..8b423ef8802 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el | |||
| @@ -919,12 +919,12 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu | |||
| 919 | (defvar table-source-info-plist nil | 919 | (defvar table-source-info-plist nil |
| 920 | "General storage for temporary information used while generating source.") | 920 | "General storage for temporary information used while generating source.") |
| 921 | 921 | ||
| 922 | ;;; The following history containers not only keep the history of user | 922 | ;; The following history containers not only keep the history of user |
| 923 | ;;; entries but also serve as the default value providers. When an | 923 | ;; entries but also serve as the default value providers. When an |
| 924 | ;;; interactive command is invoked it offers a user the latest entry | 924 | ;; interactive command is invoked it offers a user the latest entry |
| 925 | ;;; of the history as a default selection. Therefore the values below | 925 | ;; of the history as a default selection. Therefore the values below |
| 926 | ;;; are the first default value when a command is invoked for the very | 926 | ;; are the first default value when a command is invoked for the very |
| 927 | ;;; first time when there is no real history existing yet. | 927 | ;; first time when there is no real history existing yet. |
| 928 | (defvar table-cell-span-direction-history '("right")) | 928 | (defvar table-cell-span-direction-history '("right")) |
| 929 | (defvar table-cell-split-orientation-history '("horizontally")) | 929 | (defvar table-cell-split-orientation-history '("horizontally")) |
| 930 | (defvar table-cell-split-contents-to-history '("split")) | 930 | (defvar table-cell-split-contents-to-history '("split")) |
| @@ -948,19 +948,19 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu | |||
| 948 | (defvar table-capture-columns-history '("")) | 948 | (defvar table-capture-columns-history '("")) |
| 949 | (defvar table-target-history '("cell")) | 949 | (defvar table-target-history '("cell")) |
| 950 | 950 | ||
| 951 | ;;; Some entries in `table-cell-bindings' are duplicated in | 951 | ;; Some entries in `table-cell-bindings' are duplicated in |
| 952 | ;;; `table-command-remap-alist'. There is a good reason for | 952 | ;; `table-command-remap-alist'. There is a good reason for |
| 953 | ;;; this. Common key like return key may be taken by some other | 953 | ;; this. Common key like return key may be taken by some other |
| 954 | ;;; function than normal `newline' function. Thus binding return key | 954 | ;; function than normal `newline' function. Thus binding return key |
| 955 | ;;; directly for `*table--cell-newline' ensures that the correct enter | 955 | ;; directly for `*table--cell-newline' ensures that the correct enter |
| 956 | ;;; operation in a table cell. However | 956 | ;; operation in a table cell. However |
| 957 | ;;; `table-command-remap-alist' has an additional role than | 957 | ;; `table-command-remap-alist' has an additional role than |
| 958 | ;;; replacing commands. It is also used to construct a table command | 958 | ;; replacing commands. It is also used to construct a table command |
| 959 | ;;; list. This list is very important because it is used to check if | 959 | ;; list. This list is very important because it is used to check if |
| 960 | ;;; the previous command was one of them in this list or not. If the | 960 | ;; the previous command was one of them in this list or not. If the |
| 961 | ;;; previous command is found in the list the current command will not | 961 | ;; previous command is found in the list the current command will not |
| 962 | ;;; refill the table cache. If the command were not listed fast | 962 | ;; refill the table cache. If the command were not listed fast |
| 963 | ;;; typing can cause unwanted cache refill. | 963 | ;; typing can cause unwanted cache refill. |
| 964 | (defconst table-cell-bindings | 964 | (defconst table-cell-bindings |
| 965 | '(([(control i)] . table-forward-cell) | 965 | '(([(control i)] . table-forward-cell) |
| 966 | ([(control I)] . table-backward-cell) | 966 | ([(control I)] . table-backward-cell) |
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index da33df7113d..b735b446b81 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el | |||
| @@ -2507,7 +2507,7 @@ For example, @verb\{|@|\} results in @ and | |||
| 2507 | (error "Not found: @verb start brace")) | 2507 | (error "Not found: @verb start brace")) |
| 2508 | (delete-region texinfo-command-start (+ 2 texinfo-command-end)) | 2508 | (delete-region texinfo-command-start (+ 2 texinfo-command-end)) |
| 2509 | (search-forward delimiter)) | 2509 | (search-forward delimiter)) |
| 2510 | (delete-backward-char 1) | 2510 | (delete-char -1) |
| 2511 | (unless (looking-at "}") | 2511 | (unless (looking-at "}") |
| 2512 | (error "Not found: @verb end brace")) | 2512 | (error "Not found: @verb end brace")) |
| 2513 | (delete-char 1)) | 2513 | (delete-char 1)) |
diff --git a/lisp/time.el b/lisp/time.el index 5c3456e9c59..c11f399ae71 100644 --- a/lisp/time.el +++ b/lisp/time.el | |||
| @@ -524,7 +524,7 @@ See `display-time-world'." | |||
| 524 | (insert (pop result) | 524 | (insert (pop result) |
| 525 | (make-string (1+ (- max-width (pop result))) ?\s) | 525 | (make-string (1+ (- max-width (pop result))) ?\s) |
| 526 | (pop result) "\n"))) | 526 | (pop result) "\n"))) |
| 527 | (delete-backward-char 1))) | 527 | (delete-char -1))) |
| 528 | 528 | ||
| 529 | ;;;###autoload | 529 | ;;;###autoload |
| 530 | (defun display-time-world () | 530 | (defun display-time-world () |
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index f68c668f742..5e67c07957e 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el | |||
| @@ -1334,7 +1334,7 @@ Unlike (get-char-property POS 'field), this works with empty fields too." | |||
| 1334 | (goto-char end) | 1334 | (goto-char end) |
| 1335 | (while (and (eq (preceding-char) ?\s) | 1335 | (while (and (eq (preceding-char) ?\s) |
| 1336 | (> (point) begin)) | 1336 | (> (point) begin)) |
| 1337 | (delete-backward-char 1))))))) | 1337 | (delete-char -1))))))) |
| 1338 | (widget-specify-secret field)) | 1338 | (widget-specify-secret field)) |
| 1339 | (widget-apply field :notify field)))) | 1339 | (widget-apply field :notify field)))) |
| 1340 | 1340 | ||
| @@ -1477,7 +1477,7 @@ If that does not exist, call the value of `widget-complete-field'." | |||
| 1477 | ;; Parse escapes in format. | 1477 | ;; Parse escapes in format. |
| 1478 | (while (re-search-forward "%\\(.\\)" nil t) | 1478 | (while (re-search-forward "%\\(.\\)" nil t) |
| 1479 | (let ((escape (char-after (match-beginning 1)))) | 1479 | (let ((escape (char-after (match-beginning 1)))) |
| 1480 | (delete-backward-char 2) | 1480 | (delete-char -2) |
| 1481 | (cond ((eq escape ?%) | 1481 | (cond ((eq escape ?%) |
| 1482 | (insert ?%)) | 1482 | (insert ?%)) |
| 1483 | ((eq escape ?\[) | 1483 | ((eq escape ?\[) |
| @@ -1510,7 +1510,7 @@ If that does not exist, call the value of `widget-complete-field'." | |||
| 1510 | (setq doc-begin (point)) | 1510 | (setq doc-begin (point)) |
| 1511 | (insert doc) | 1511 | (insert doc) |
| 1512 | (while (eq (preceding-char) ?\n) | 1512 | (while (eq (preceding-char) ?\n) |
| 1513 | (delete-backward-char 1)) | 1513 | (delete-char -1)) |
| 1514 | (insert ?\n) | 1514 | (insert ?\n) |
| 1515 | (setq doc-end (point))))) | 1515 | (setq doc-end (point))))) |
| 1516 | ((eq escape ?h) | 1516 | ((eq escape ?h) |
| @@ -2258,7 +2258,7 @@ If the item is checked, CHOSEN is a cons whose cdr is the value." | |||
| 2258 | ;; Parse % escapes in format. | 2258 | ;; Parse % escapes in format. |
| 2259 | (while (re-search-forward "%\\([bv%]\\)" nil t) | 2259 | (while (re-search-forward "%\\([bv%]\\)" nil t) |
| 2260 | (let ((escape (char-after (match-beginning 1)))) | 2260 | (let ((escape (char-after (match-beginning 1)))) |
| 2261 | (delete-backward-char 2) | 2261 | (delete-char -2) |
| 2262 | (cond ((eq escape ?%) | 2262 | (cond ((eq escape ?%) |
| 2263 | (insert ?%)) | 2263 | (insert ?%)) |
| 2264 | ((eq escape ?b) | 2264 | ((eq escape ?b) |
| @@ -2441,7 +2441,7 @@ Return an alist of (TYPE MATCH)." | |||
| 2441 | ;; Parse % escapes in format. | 2441 | ;; Parse % escapes in format. |
| 2442 | (while (re-search-forward "%\\([bv%]\\)" nil t) | 2442 | (while (re-search-forward "%\\([bv%]\\)" nil t) |
| 2443 | (let ((escape (char-after (match-beginning 1)))) | 2443 | (let ((escape (char-after (match-beginning 1)))) |
| 2444 | (delete-backward-char 2) | 2444 | (delete-char -2) |
| 2445 | (cond ((eq escape ?%) | 2445 | (cond ((eq escape ?%) |
| 2446 | (insert ?%)) | 2446 | (insert ?%)) |
| 2447 | ((eq escape ?b) | 2447 | ((eq escape ?b) |
| @@ -2720,7 +2720,7 @@ Return an alist of (TYPE MATCH)." | |||
| 2720 | ;; Parse % escapes in format. | 2720 | ;; Parse % escapes in format. |
| 2721 | (while (re-search-forward "%\\(.\\)" nil t) | 2721 | (while (re-search-forward "%\\(.\\)" nil t) |
| 2722 | (let ((escape (char-after (match-beginning 1)))) | 2722 | (let ((escape (char-after (match-beginning 1)))) |
| 2723 | (delete-backward-char 2) | 2723 | (delete-char -2) |
| 2724 | (cond ((eq escape ?%) | 2724 | (cond ((eq escape ?%) |
| 2725 | (insert ?%)) | 2725 | (insert ?%)) |
| 2726 | ((eq escape ?i) | 2726 | ((eq escape ?i) |
diff --git a/lisp/woman.el b/lisp/woman.el index fa7ea1836ae..3efe15d5f7d 100644 --- a/lisp/woman.el +++ b/lisp/woman.el | |||
| @@ -2443,7 +2443,7 @@ Preserves location of `point'." | |||
| 2443 | (while (and | 2443 | (while (and |
| 2444 | (<= (setq N (1+ N)) 0) | 2444 | (<= (setq N (1+ N)) 0) |
| 2445 | (cond ((memq (preceding-char) '(?\ ?\t)) | 2445 | (cond ((memq (preceding-char) '(?\ ?\t)) |
| 2446 | (delete-backward-char 1) t) | 2446 | (delete-char -1) t) |
| 2447 | ((memq (following-char) '(?\ ?\t)) | 2447 | ((memq (following-char) '(?\ ?\t)) |
| 2448 | (delete-char 1) t) | 2448 | (delete-char 1) t) |
| 2449 | (t nil)))) | 2449 | (t nil)))) |
| @@ -3121,7 +3121,7 @@ If optional arg CONCAT is non-nil then join arguments." | |||
| 3121 | (if unquote (delete-char 1) (forward-char)) | 3121 | (if unquote (delete-char 1) (forward-char)) |
| 3122 | (re-search-forward "\"\\|$")) | 3122 | (re-search-forward "\"\\|$")) |
| 3123 | (if (eq (preceding-char) ?\") | 3123 | (if (eq (preceding-char) ?\") |
| 3124 | (if unquote (delete-backward-char 1)) | 3124 | (if unquote (delete-char -1)) |
| 3125 | (WoMan-warn "Unpaired \" in .%s arguments." request))) | 3125 | (WoMan-warn "Unpaired \" in .%s arguments." request))) |
| 3126 | ;; (re-search-forward "[^\\\n] \\|$") ; inconsistent | 3126 | ;; (re-search-forward "[^\\\n] \\|$") ; inconsistent |
| 3127 | (skip-syntax-forward "^ ")) | 3127 | (skip-syntax-forward "^ ")) |
| @@ -4346,7 +4346,7 @@ The variable `tab-stop-list' is a list whose elements are either left | |||
| 4346 | tab stop columns or pairs (COLUMN . TYPE) where TYPE is R or C." | 4346 | tab stop columns or pairs (COLUMN . TYPE) where TYPE is R or C." |
| 4347 | ;; Based on tab-to-tab-stop in indent.el. | 4347 | ;; Based on tab-to-tab-stop in indent.el. |
| 4348 | ;; R & C tabs probably not quite right! | 4348 | ;; R & C tabs probably not quite right! |
| 4349 | (delete-backward-char 1) | 4349 | (delete-char -1) |
| 4350 | (let ((tabs tab-stop-list)) | 4350 | (let ((tabs tab-stop-list)) |
| 4351 | (while (and tabs (>= (current-column) | 4351 | (while (and tabs (>= (current-column) |
| 4352 | (woman-get-tab-stop (car tabs)))) | 4352 | (woman-get-tab-stop (car tabs)))) |
| @@ -4400,7 +4400,7 @@ Needs doing properly!" | |||
| 4400 | (delete-char 1) | 4400 | (delete-char 1) |
| 4401 | (insert woman-unpadded-space-char) | 4401 | (insert woman-unpadded-space-char) |
| 4402 | (goto-char (match-end 0)) | 4402 | (goto-char (match-end 0)) |
| 4403 | (delete-backward-char 1) | 4403 | (delete-char -1) |
| 4404 | (insert-before-markers woman-unpadded-space-char) | 4404 | (insert-before-markers woman-unpadded-space-char) |
| 4405 | (subst-char-in-region | 4405 | (subst-char-in-region |
| 4406 | (match-beginning 0) (match-end 0) | 4406 | (match-beginning 0) (match-end 0) |