aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emulation
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/viper-ex.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 41c9a3973a6..4496f1cf7d5 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -427,18 +427,18 @@ reversed."
427 (forward-char 1) 427 (forward-char 1)
428 (setq ex-token-type 'whole)) 428 (setq ex-token-type 'whole))
429 ((= char ?+) 429 ((= char ?+)
430 (cond ((or (looking-at "+[-+]") (looking-at "+[\n|]")) 430 (cond ((looking-at "\\+[-+\n|]")
431 (forward-char 1) 431 (forward-char 1)
432 (insert "1") 432 (insert "1")
433 (backward-char 1) 433 (backward-char 1)
434 (setq ex-token-type 'plus)) 434 (setq ex-token-type 'plus))
435 ((looking-at "+[0-9]") 435 ((looking-at "\\+[0-9]")
436 (forward-char 1) 436 (forward-char 1)
437 (setq ex-token-type 'plus)) 437 (setq ex-token-type 'plus))
438 (t 438 (t
439 (error viper-BadAddress)))) 439 (error viper-BadAddress))))
440 ((= char ?-) 440 ((= char ?-)
441 (cond ((or (looking-at "-[-+]") (looking-at "-[\n|]")) 441 (cond ((looking-at "-[-+\n|]")
442 (forward-char 1) 442 (forward-char 1)
443 (insert "1") 443 (insert "1")
444 (backward-char 1) 444 (backward-char 1)
@@ -455,7 +455,7 @@ reversed."
455 (while (and (not (eolp)) cont) 455 (while (and (not (eolp)) cont)
456 ;;(re-search-forward "[^/]*/") 456 ;;(re-search-forward "[^/]*/")
457 (re-search-forward "[^/]*\\(/\\|\n\\)") 457 (re-search-forward "[^/]*\\(/\\|\n\\)")
458 (if (not (looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\/" 458 (if (not (looking-back "[^\\]\\(\\\\\\\\\\)*\\\\/"
459 (line-beginning-position 0))) 459 (line-beginning-position 0)))
460 (setq cont nil)))) 460 (setq cont nil))))
461 (backward-char 1) 461 (backward-char 1)
@@ -469,7 +469,7 @@ reversed."
469 (while (and (not (eolp)) cont) 469 (while (and (not (eolp)) cont)
470 ;;(re-search-forward "[^\\?]*\\?") 470 ;;(re-search-forward "[^\\?]*\\?")
471 (re-search-forward "[^\\?]*\\(\\?\\|\n\\)") 471 (re-search-forward "[^\\?]*\\(\\?\\|\n\\)")
472 (if (not (looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\\\?" 472 (if (not (looking-back "[^\\]\\(\\\\\\\\\\)*\\\\\\?"
473 (line-beginning-position 0))) 473 (line-beginning-position 0)))
474 (setq cont nil)) 474 (setq cont nil))
475 (backward-char 1) 475 (backward-char 1)
@@ -744,7 +744,7 @@ reversed."
744 (error 744 (error
745 "Global regexp must be inside matching non-alphanumeric chars")) 745 "Global regexp must be inside matching non-alphanumeric chars"))
746 ((= c ??) (error "`?' is not an allowed pattern delimiter here"))) 746 ((= c ??) (error "`?' is not an allowed pattern delimiter here")))
747 (if (looking-at "[^\\\\\n]") 747 (if (looking-at "[^\\\n]")
748 (progn 748 (progn
749 (forward-char 1) 749 (forward-char 1)
750 (set-mark (point)) 750 (set-mark (point))
@@ -757,7 +757,7 @@ reversed."
757 (error "Missing closing delimiter for global regexp") 757 (error "Missing closing delimiter for global regexp")
758 (goto-char (point-max)))) 758 (goto-char (point-max))))
759 (if (not (looking-back 759 (if (not (looking-back
760 (format "[^\\\\]\\(\\\\\\\\\\)*\\\\%c" c) 760 (format "[^\\]\\(\\\\\\\\\\)*\\\\%c" c)
761 (line-beginning-position 0))) 761 (line-beginning-position 0)))
762 (setq cont nil) 762 (setq cont nil)
763 ;; we are at an escaped delimiter: unescape it and continue 763 ;; we are at an escaped delimiter: unescape it and continue
@@ -1686,7 +1686,7 @@ reversed."
1686 (message ":set <Variable> [= <Value>]") 1686 (message ":set <Variable> [= <Value>]")
1687 (or batch (sit-for 2)) 1687 (or batch (sit-for 2))
1688 1688
1689 (while (string-match "^[ \\t\\n]*$" 1689 (while (string-match "^[ \t\n]*$"
1690 (setq str 1690 (setq str
1691 (completing-read ":set " ex-variable-alist))) 1691 (completing-read ":set " ex-variable-alist)))
1692 (message ":set <Variable> [= <Value>]") 1692 (message ":set <Variable> [= <Value>]")