[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 717a99d 09/18: Clean up after previous viper patch
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 717a99d 09/18: Clean up after previous viper patch |
Date: |
Thu, 20 Jun 2019 06:51:57 -0400 (EDT) |
branch: master
commit 717a99dacffaa8981d907d23e0fb0af7a127149f
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Clean up after previous viper patch
* lisp/emulation/viper-ex.el (viper-get-ex-address-subr): Fix
syntax error in last checkin.
(viper-ex): Don't use now-obsolete function.
---
lisp/emulation/viper-ex.el | 10 ++++------
lisp/emulation/viper-macs.el | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 56ed2f7..f64960d 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -678,7 +678,7 @@ reversed."
(viper-get-ex-token)
(cond ((memq ex-token-type '(command end-mark))
(if address (setq ex-addresses (cons address ex-addresses)))
- (viper-deactivate-mark)
+ (deactivate-mark)
(let ((cmd (ex-cmd-assoc ex-token ex-token-alist)))
(if (null cmd)
(error "`%s': %s" ex-token viper-BadExCommand))
@@ -881,9 +881,7 @@ reversed."
(if (null ex-token)
(exchange-point-and-mark)
(goto-char
- (viper-register-to-point
- (1+ (- ex-token ?a)))
- 'enforce-buffer))
+ (viper-register-to-point (1+ (- ex-token ?a)) 'enforce-buffer)))
(setq address (point-marker)))))
address))
@@ -1175,7 +1173,7 @@ reversed."
(princ "\n=============\n")
(princ "\nThe numbers can be given as counts to :next. ")
(princ "\n\nPress any key to continue...\n\n"))
- (viper-read-event))))))
+ (read-event))))))
;; Ex cd command. Default directory of this buffer changes
(defun ex-cd ()
@@ -2242,7 +2240,7 @@ Type `mak ' (including the space) to run make with no
args."
(with-output-to-temp-buffer " *viper-info*"
(princ (concat "\n" file "\n\n\t" info "\n\n")))
(let ((inhibit-quit t))
- (viper-set-unread-command-events (viper-read-event)))
+ (viper-set-unread-command-events (read-event)))
(kill-buffer " *viper-info*")))
))
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 243a0a8..3dd6a01 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -874,7 +874,7 @@ mistakes in macro names to be passed to this function is to
use
;; read-key then events will be converted to keys, and sometimes
;; (e.g., (control \[)) those keys differ from the corresponding events.
;; So, do not use (setq next-event (read-key))
- (setq next-event (viper-read-event))
+ (setq next-event (read-event))
(or (viper-mouse-event-p next-event)
(setq lis (vconcat lis (vector next-event)))))
lis))
- [Emacs-diffs] master updated (920745e -> 77e8d41), Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 3c16eda 02/18: Remove XEmacs compat code from pascal.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master ac3219c 03/18: Remove XEmacs compat code from uudecode.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master ec45664 04/18: Remove XEmacs compat code from binhex.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 954b58f 12/18: Remove XEmacs compat code from dns-mode.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 82aeaf1 07/18: Remove XEmacs compat code from viper-macs.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master b67a6cb 11/18: Clean up eieio-custom slightly, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 717a99d 09/18: Clean up after previous viper patch,
Lars Ingebrigtsen <=
- [Emacs-diffs] master 4e0baad 10/18: Remove XEmacs compat code from checkdoc.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master c2e2794 01/18: Remove XEmacs support from cperl-mode, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 1f6e6ee 05/18: Remove XEmacs and old Emacs compat code from gamegrid.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 86c3d92 15/18: Remove XEmacs compat code from gravatar.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 77e8d41 18/18: Declare semantic-*overlay* aliases obsolete, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master a4047f9 06/18: Remove XEmacs compat code from viper-cmd.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 45a0ce0 13/18: Remove XEmacs compat code from table.el, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master 9f4cced 14/18: Remove XEmacs compat code from erc, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master e383aad 16/18: Remove XEmacs compat code from cedet, Lars Ingebrigtsen, 2019/06/20
- [Emacs-diffs] master dfec2bc 08/18: Remove most of the XEmacs compat code from viper*.el, Lars Ingebrigtsen, 2019/06/20