comparison lisp/emulation/viper-cmd.el @ 85972:51aa47312c4b

* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove. (ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version) (ediff-current-diff-A, ediff-current-diff-B) (ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A) (ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A) (ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor) (ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C) (ediff-odd-diff-Ancestor, ediff-reset-mouse): * ediff-wind.el (ediff-narrow-control-frame-leftward-shift) (ediff-setup-windows-plain-merge) (ediff-setup-windows-plain-compare, ediff-setup-control-frame) (ediff-refresh-control-frame, ediff-get-visible-buffer-window): * ediff-util.el (ediff-setup-keymap, ) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-really-quit) (ediff-good-frame-under-mouse) (ediff-highlight-diff-in-one-buffer) (ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1) (ediff-make-bullet-proof-overlay): * ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p) (ediff-set-meta-overlay): * ediff-help.el (ediff-help-region-map, ediff-set-help-overlays): * ediff.el (ediff-documentation): Replace ediff-xemacs-p and ediff-emacs-p with their former definitions. * emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove. (viper-has-face-support-p, viper-inactivate-input-method) (viper-activate-input-method) (viper-use-replace-region-delimiters, viper-restore-cursor-type): * emulation/viper-mous.el (viper-multiclick-timeout) (viper-surrounding-word, viper-mouse-click-insert-word) (viper-mouse-click-search-word, viper-parse-mouse-key): * emulation/viper-macs.el (viper-char-array-to-macro): * emulation/viper.el (viper-go-away, viper-set-hooks) (viper-non-hook-settings): * emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode) (viper-get-saved-cursor-color-in-insert-mode) (viper-get-saved-cursor-color-in-emacs-mode) (viper-check-version, viper-get-visible-buffer-window) (viper-file-checked-in-p, viper-set-replace-overlay) (viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay) (viper-check-minibuffer-overlay, viper-read-key-sequence) (viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p with their former definitions. (viper-eventify-list-xemacs): Only do work for XEmacs. (viper-set-unread-command-events): Only do work for Emacs. (viper-overlay-p, viper-make-overlay, viper-overlay-live-p) (viper-move-overlay, viper-overlay-start, viper-overlay-end) (viper-overlay-get, viper-overlay-put, viper-read-event) (viper-characterp, viper-int-to-char, viper-get-face) (viper-color-defined-p, viper-iconify): New defaliases replacing the old fsets. * progmodes/fortran.el (comment-region-function) (uncomment-region-function): Pacify byte compiler. * vc.el (vc-diff-internal): Remove code for an old version of gnus.

85971:2e692f327278

      (let (viper-vi-kbd-minor-mode
	    viper-insert-kbd-minor-mode
	    viper-emacs-kbd-minor-mode
	    ch)
	(cond ((and viper-special-input-method
		    viper-emacs-p
		    (fboundp 'quail-input-method))
	       ;; (let ...) is used to restore unread-command-events to the
	       ;; original state. We don't want anything left in there after
	       ;; key translation. (Such left-overs are possible if the user
	       ;; types a regular key.)

		 (setq ch (or ch
			      (aref quail-current-str
				    (1- (length quail-current-str)))))
		 ))
	      ((and viper-special-input-method
		    viper-xemacs-p
		    (fboundp 'quail-start-translation))
	       ;; same as above but for XEmacs, which doesn't have
	       ;; quail-input-method
	       (let (unread-command-events)
		 (setq ch (read-char-exclusive))

		   (setq ch (aref (read-key-sequence nil) 0)))
	       (insert ch))
	      (t
	       ;;(setq ch (read-char-exclusive))
	       (setq ch (aref (read-key-sequence nil) 0))
	       (if viper-xemacs-p
		   (setq ch (event-to-character ch)))
	       ;; replace ^M with the newline
	       (if (eq ch ?\C-m) (setq ch ?\n))
	       ;; Make sure ^V and ^Q work as quotation chars
	       (if (memq ch '(?\C-v ?\C-q))
		   (progn
		     ;;(setq ch (read-char-exclusive))
		     (setq ch (aref (read-key-sequence nil) 0))
		     (if viper-xemacs-p
			 (setq ch (event-to-character ch))))
		 )
	       (insert ch))
	      )
	(setq last-command-event
	      (viper-copy-event (if viper-xemacs-p
				    (character-to-event ch) ch)))
	) ; let
    (error nil)
    ) ; condition-case

			      (not viper-translate-all-ESC-keysequences))
			 ;; put keys following ESC on the unread list
			 ;; and return ESC as the key-sequence
			 (viper-set-unread-command-events (viper-subseq keyseq 1))
			 (setq last-input-event event
			       keyseq (if viper-emacs-p
					  "\e"
					(vector (character-to-event ?\e)))))
			((and viper-xemacs-p
			      (key-press-event-p first-key)
			      (equal '(meta) key-mod))
			 (viper-set-unread-command-events
			  (vconcat (vector
				    (character-to-event (event-key first-key)))

    (if cmd-to-exec-at-end
	(progn
	  (setq last-command-char char)
	  (setq last-command-event
		(viper-copy-event
		 (if viper-xemacs-p (character-to-event char) char)))
	  (condition-case err
	      (funcall cmd-to-exec-at-end cmd-info)
	    (error
	     (error "%s" (error-message-string err))))))
    ))

      (- (viper-chars-in-region pt (point))))))

(defun viper-next-line-carefully (arg)
  (condition-case nil
      ;; do not use forward-line! need to keep column
      (next-line arg)
    (error nil)))



;;; Word command

  (viper-leave-region-active)
  (let ((val (viper-p-val arg))
	(com (viper-getCom arg)))
    (if com (viper-move-marker-locally 'viper-com-point (point)))
    ;; do not use forward-line! need to keep column
    (next-line val)
    (if viper-ex-style-motion
	(if (and (eolp) (not (bolp))) (backward-char 1)))
    (setq this-command 'next-line)
    (if com (viper-execute-com 'viper-next-line val com))))

  (viper-leave-region-active)
  (let ((val (viper-p-val arg))
	(com (viper-getCom arg)))
    (if com (viper-move-marker-locally 'viper-com-point (point)))
    ;; do not use forward-line! need to keep column
    (previous-line val)
    (if viper-ex-style-motion
	(if (and (eolp) (not (bolp))) (backward-char 1)))
    (setq this-command 'previous-line)
    (if com (viper-execute-com 'viper-previous-line val com))))

85972:51aa47312c4b

      (let (viper-vi-kbd-minor-mode
	    viper-insert-kbd-minor-mode
	    viper-emacs-kbd-minor-mode
	    ch)
	(cond ((and viper-special-input-method
		    (featurep 'emacs)
		    (fboundp 'quail-input-method))
	       ;; (let ...) is used to restore unread-command-events to the
	       ;; original state. We don't want anything left in there after
	       ;; key translation. (Such left-overs are possible if the user
	       ;; types a regular key.)

		 (setq ch (or ch
			      (aref quail-current-str
				    (1- (length quail-current-str)))))
		 ))
	      ((and viper-special-input-method
		    (featurep 'xemacs)
		    (fboundp 'quail-start-translation))
	       ;; same as above but for XEmacs, which doesn't have
	       ;; quail-input-method
	       (let (unread-command-events)
		 (setq ch (read-char-exclusive))

		   (setq ch (aref (read-key-sequence nil) 0)))
	       (insert ch))
	      (t
	       ;;(setq ch (read-char-exclusive))
	       (setq ch (aref (read-key-sequence nil) 0))
	       (if (featurep 'xemacs)
		   (setq ch (event-to-character ch)))
	       ;; replace ^M with the newline
	       (if (eq ch ?\C-m) (setq ch ?\n))
	       ;; Make sure ^V and ^Q work as quotation chars
	       (if (memq ch '(?\C-v ?\C-q))
		   (progn
		     ;;(setq ch (read-char-exclusive))
		     (setq ch (aref (read-key-sequence nil) 0))
		     (if (featurep 'xemacs)
			 (setq ch (event-to-character ch))))
		 )
	       (insert ch))
	      )
	(setq last-command-event
	      (viper-copy-event (if (featurep 'xemacs)
				    (character-to-event ch) ch)))
	) ; let
    (error nil)
    ) ; condition-case

			      (not viper-translate-all-ESC-keysequences))
			 ;; put keys following ESC on the unread list
			 ;; and return ESC as the key-sequence
			 (viper-set-unread-command-events (viper-subseq keyseq 1))
			 (setq last-input-event event
			       keyseq (if (featurep 'emacs)
					  "\e"
					(vector (character-to-event ?\e)))))
			((and (featurep 'xemacs)
			      (key-press-event-p first-key)
			      (equal '(meta) key-mod))
			 (viper-set-unread-command-events
			  (vconcat (vector
				    (character-to-event (event-key first-key)))

    (if cmd-to-exec-at-end
	(progn
	  (setq last-command-char char)
	  (setq last-command-event
		(viper-copy-event
		 (if (featurep 'xemacs) (character-to-event char) char)))
	  (condition-case err
	      (funcall cmd-to-exec-at-end cmd-info)
	    (error
	     (error "%s" (error-message-string err))))))
    ))

      (- (viper-chars-in-region pt (point))))))

(defun viper-next-line-carefully (arg)
  (condition-case nil
      ;; do not use forward-line! need to keep column
      (with-no-warnings (next-line arg))
    (error nil)))



;;; Word command

  (viper-leave-region-active)
  (let ((val (viper-p-val arg))
	(com (viper-getCom arg)))
    (if com (viper-move-marker-locally 'viper-com-point (point)))
    ;; do not use forward-line! need to keep column
    (with-no-warnings (next-line val))
    (if viper-ex-style-motion
	(if (and (eolp) (not (bolp))) (backward-char 1)))
    (setq this-command 'next-line)
    (if com (viper-execute-com 'viper-next-line val com))))

  (viper-leave-region-active)
  (let ((val (viper-p-val arg))
	(com (viper-getCom arg)))
    (if com (viper-move-marker-locally 'viper-com-point (point)))
    ;; do not use forward-line! need to keep column
    (with-no-warnings (previous-line val))
    (if viper-ex-style-motion
	(if (and (eolp) (not (bolp))) (backward-char 1)))
    (setq this-command 'previous-line)
    (if com (viper-execute-com 'viper-previous-line val com))))