diff options
Diffstat (limited to 'lisp/obsolete/vip.el')
| -rw-r--r-- | lisp/obsolete/vip.el | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/obsolete/vip.el b/lisp/obsolete/vip.el index e0566cdb78c..9943fb2548b 100644 --- a/lisp/obsolete/vip.el +++ b/lisp/obsolete/vip.el @@ -1858,7 +1858,7 @@ STRING. Search will be forward if FORWARD, otherwise backward." (+ vip-use-register 32) (point) (+ (point) val)) (copy-to-register vip-use-register (point) (+ (point) val) nil)) (setq vip-use-register nil))) - (delete-backward-char val t))) + (with-no-warnings (delete-backward-char val t)))) ;; join lines. @@ -2187,19 +2187,19 @@ a token has type \(command, address, end-mark\) and value." ((looking-at "%") (forward-char 1) (setq ex-token-type "whole")) - ((looking-at "+") - (cond ((or (looking-at "+[-+]") (looking-at "+[\n|]")) + ((looking-at "\\+") + (cond ((looking-at "\\+[-+\n|]") (forward-char 1) (insert "1") (backward-char 1) (setq ex-token-type "plus")) - ((looking-at "+[0-9]") + ((looking-at "\\+[0-9]") (forward-char 1) (setq ex-token-type "plus")) (t (error "Badly formed address")))) ((looking-at "-") - (cond ((or (looking-at "-[-+]") (looking-at "-[\n|]")) + (cond ((looking-at "-[-+\n|]") (forward-char 1) (insert "1") (backward-char 1) @@ -2216,7 +2216,7 @@ a token has type \(command, address, end-mark\) and value." (while (and (not (eolp)) cont) ;;(re-search-forward "[^/]*/") (re-search-forward "[^/]*\\(/\\|\n\\)") - (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\/")) + (if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\/")) (setq cont nil)))) (backward-char 1) (setq ex-token (buffer-substring (point) (mark))) @@ -2229,7 +2229,7 @@ a token has type \(command, address, end-mark\) and value." (while (and (not (eolp)) cont) ;;(re-search-forward "[^\\?]*\\?") (re-search-forward "[^\\?]*\\(\\?\\|\n\\)") - (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\\\?")) + (if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\\\?")) (setq cont nil)) (backward-char 1) (if (not (looking-at "\n")) (forward-char 1)))) @@ -2325,7 +2325,7 @@ a token has type \(command, address, end-mark\) and value." (while (and (not (eolp)) cont) (re-search-forward "[^/]*\\(/\\|\n\\)") ;;(re-search-forward "[^/]*/") - (if (not (vip-looking-back "[^\\\\]\\(\\\\\\\\\\)*\\\\/")) + (if (not (vip-looking-back "[^\\]\\(\\\\\\\\\\)*\\\\/")) (setq cont nil)))) (setq ex-token (if (= (mark) (point)) "" @@ -2520,7 +2520,7 @@ a token has type \(command, address, end-mark\) and value." ex-variant t) (forward-char 2) (skip-chars-forward " \t"))) - (if (looking-at "+") + (if (looking-at "\\+") (progn (forward-char 1) (set-mark (point)) @@ -2979,9 +2979,10 @@ vip-s-string" (vip-change-mode-to-emacs) (condition-case conditions (progn - (if (string= tag "") - (find-tag ex-tag t) - (find-tag-other-window ex-tag)) + (with-suppressed-warnings ((obsolete find-tag find-tag-other-window)) + (if (string= tag "") + (find-tag ex-tag t) + (find-tag-other-window ex-tag))) (vip-change-mode-to-vi)) (error (vip-change-mode-to-vi) |