comparison lisp/emulation/viper-cmd.el @ 111426:5dbc2ccef17c

Silence viper-cmd compilation. * lisp/emulation/viper-cmd.el (viper-read-string-with-history): Prefix dynamic local `initial'. (viper-minibuffer-standard-hook): Update for above name change.

111425:9ee34f35bd15

;;; viper-cmd.el --- Vi command support for Viper

;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

;; Author: Michael Kifer <[e-mail]>
;; Package: viper

;; This file is part of GNU Emacs.

(defvar iso-accents-mode)
(defvar quail-mode)
(defvar quail-current-str)
(defvar mark-even-if-inactive)
(defvar init-message)
(defvar initial)
(defvar undo-beg-posn)
(defvar undo-end-posn)

(eval-and-compile
  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))

	  viper-last-insertion nil
	  viper-command-ring nil)
    (funcall hook)
    ))

;; Thie is a temp hook that uses free variables init-message and initial.
;; A dirty feature, but it is the simplest way to have it do the right thing.
;; The INIT-MESSAGE and INITIAL vars come from the scope set by
;; viper-read-string-with-history
(defun viper-minibuffer-standard-hook ()
  (if (stringp init-message)
      (viper-tmp-insert-at-eob init-message))
  (if (stringp initial)
      (progn
	;; don't wait if we have unread events or in kbd macro
	(or unread-command-events
	    executing-kbd-macro
	    (sit-for 840))
	(if (fboundp 'minibuffer-prompt-end)
	    (delete-region (minibuffer-prompt-end) (point-max))
	  (erase-buffer))
	(insert initial))))

(defsubst viper-minibuffer-real-start ()
  (if (fboundp 'minibuffer-prompt-end)
      (minibuffer-prompt-end)
    (point-min)))

	(delete-region (point) (point-max)))))


;;; Reading string with history

(defun viper-read-string-with-history (prompt &optional initial
					      history-var default keymap
					      init-message)
  ;; Read string, prompting with PROMPT and inserting the INITIAL
  ;; value.  Uses HISTORY-VAR.  DEFAULT is the default value to accept if the
  ;; input is an empty string.
  ;; Default value is displayed until the user types something in the
  ;; minibuffer.
  ;; KEYMAP is used, if given, instead of minibuffer-local-map.

	(val "")
	(padding "")
	temp-msg)

    (setq keymap (or keymap minibuffer-local-map)
	  initial (or initial "")
	  temp-msg (if default
		       (format "(default %s) " default)
		     ""))

    (setq viper-incomplete-ex-cmd nil)
    (setq val (read-from-minibuffer prompt
				    (concat temp-msg initial val padding)
				    keymap nil history-var))
    (setq minibuffer-setup-hook nil
	  padding (viper-array-to-string (this-command-keys))
	  temp-msg "")
    ;; the following tries to be smart about what to put in history

	  ))




;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2
;;; viper-cmd.el ends here

111426:5dbc2ccef17c

;;; viper-cmd.el --- Vi command support for Viper

;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.

;; Author: Michael Kifer <[e-mail]>
;; Package: viper

;; This file is part of GNU Emacs.

(defvar iso-accents-mode)
(defvar quail-mode)
(defvar quail-current-str)
(defvar mark-even-if-inactive)
(defvar init-message)
(defvar viper-initial)
(defvar undo-beg-posn)
(defvar undo-end-posn)

(eval-and-compile
  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))

	  viper-last-insertion nil
	  viper-command-ring nil)
    (funcall hook)
    ))

;; This is a temp hook that uses free variables init-message and viper-initial.
;; A dirty feature, but it is the simplest way to have it do the right thing.
;; The INIT-MESSAGE and VIPER-INITIAL vars come from the scope set by
;; viper-read-string-with-history
(defun viper-minibuffer-standard-hook ()
  (if (stringp init-message)
      (viper-tmp-insert-at-eob init-message))
  (when (stringp viper-initial)
    ;; don't wait if we have unread events or in kbd macro
    (or unread-command-events
	executing-kbd-macro
	(sit-for 840))
    (if (fboundp 'minibuffer-prompt-end)
	(delete-region (minibuffer-prompt-end) (point-max))
      (erase-buffer))
    (insert viper-initial)))

(defsubst viper-minibuffer-real-start ()
  (if (fboundp 'minibuffer-prompt-end)
      (minibuffer-prompt-end)
    (point-min)))

	(delete-region (point) (point-max)))))


;;; Reading string with history

(defun viper-read-string-with-history (prompt &optional viper-initial
					      history-var default keymap
					      init-message)
  ;; Read string, prompting with PROMPT and inserting the VIPER-INITIAL
  ;; value.  Uses HISTORY-VAR.  DEFAULT is the default value to accept if the
  ;; input is an empty string.
  ;; Default value is displayed until the user types something in the
  ;; minibuffer.
  ;; KEYMAP is used, if given, instead of minibuffer-local-map.

	(val "")
	(padding "")
	temp-msg)

    (setq keymap (or keymap minibuffer-local-map)
	  viper-initial (or viper-initial "")
	  temp-msg (if default
		       (format "(default %s) " default)
		     ""))

    (setq viper-incomplete-ex-cmd nil)
    (setq val (read-from-minibuffer prompt
				    (concat temp-msg viper-initial val padding)
				    keymap nil history-var))
    (setq minibuffer-setup-hook nil
	  padding (viper-array-to-string (this-command-keys))
	  temp-msg "")
    ;; the following tries to be smart about what to put in history

	  ))




;;; viper-cmd.el ends here