comparison lisp/simple.el @ 49597:e88404e8f2cf

Trailing whitespace deleted.

49596:b06535145619

  ;; you must type some other command.
  (setq this-command 'undo)
  (let ((modified (buffer-modified-p))
	(recent-save (recent-auto-save-p)))
    (or (eq (selected-window) (minibuffer-window))
	(message (if (and transient-mark-mode mark-active) 
		     "Undo in region!"
		   "Undo!")))
    (unless (eq last-command 'undo)
      (if (if transient-mark-mode mark-active (and arg (not (numberp arg))))
	  (undo-start (region-beginning) (region-end))

(defun undo-more (count)
  "Undo back N undo-boundaries beyond what was already undone recently.
Call `undo-start' to get ready to undo recent changes,
then call `undo-more' one or more times to undo them."
  (or pending-undo-list
      (error (format "No further undo information%s" 
		     (if (and transient-mark-mode mark-active) 
			 " for region" ""))))
  (let ((undo-in-progress t))
    (setq pending-undo-list (primitive-undo count pending-undo-list))))

;; Deep copy of a list

					     (list buffer error-file)
					   buffer)
					 nil shell-command-switch command)))
	  ;; Report the output.
	  (with-current-buffer buffer
	    (setq mode-line-process 
		  (cond ((null exit-status)
			 " - Error")
			((stringp exit-status)
			 (format " - Signal [%s]" exit-status))
			((not (equal 0 exit-status))

If `interprogram-cut-function' is non-nil, apply it to STRING.
Optional second argument REPLACE non-nil means that STRING will replace
the front of the kill ring, rather than being added to the list.

Optional third arguments YANK-HANDLER controls how the STRING is later
inserted into a buffer; see `insert-for-yank' for details.  
When a yank handler is specified, STRING must be non-empty (the yank
handler is stored as a `yank-handler'text property on STRING).

When the yank handler has a non-nil PARAM element, the original STRING
argument is not used by `insert-for-yank'.  However, since Lisp code
may access and use elements from the kill-ring directly, the STRING
argument should still be a \"useful\" string for such uses."
  (if (> (length string) 0)
      (if yank-handler 
	  (put-text-property 0 1 'yank-handler yank-handler string)
	(remove-list-of-text-properties 0 1 '(yank-handler) string))
    (if yank-handler
	(signal 'args-out-of-range 
		(list string "yank-handler specified for empty string"))))
  (if (fboundp 'menu-bar-update-yank-menu)
      (menu-bar-update-yank-menu string (and replace (car kill-ring))))
  (if (and replace kill-ring)
      (setcar kill-ring string)

If BEFORE-P is non-nil, prepend STRING to the kill.
Optional third argument YANK-HANDLER specifies the yank-handler text
property to be set on the combined kill ring string.  If the specified
yank-handler arg differs from the yank-handler property of the latest
kill string, STRING is added as a new kill ring element instead of
being appending to the last kill. 
If `interprogram-cut-function' is set, pass the resulting kill to it."
  (let* ((cur (car kill-ring)))
    (kill-new (if before-p (concat string cur) (concat cur string))
	      (or (= (length cur) 0)
		  (equal yank-handler (get-text-property 0 'yank-handler cur)))

If the previous command was also a kill command,
the text killed this time appends to the text killed last time
to make one entry in the kill ring.

In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler
text property to be set on the killed text.  See `insert-for-yank'." 
  (interactive "r")
  (condition-case nil
      (let ((string (delete-and-extract-region beg end)))
	(when string			;STRING is nil if BEG = END
	  ;; Add that string to the kill ring, one way or another.

This command works even when the mark is not active,
and it reactivates the mark.
With prefix arg, `transient-mark-mode' is enabled temporarily."
  (interactive "P")
  (if arg
      (if mark-active 
	  (if (null transient-mark-mode)
	      (setq transient-mark-mode 'lambda))
	(setq arg nil)))
  (unless arg
    (let ((omark (mark t)))

	  (and prefix (not (equal prefix ""))
	       ;; Use auto-indentation rather than a guessed empty prefix.
	       (not (and fill-indent-according-to-mode
			 (string-match "\\`[ \t]*\\'" prefix)))
	       (setq fill-prefix prefix))))
      
      (while (and (not give-up) (> (current-column) fc))
	;; Determine where to split the line.
	(let* (after-prefix
	       (fill-point
		(let ((opoint (point)))

	(error "Value `%S' does not match type %S of %S"
	       val (car type) var))))

  (if make-local
      (make-local-variable var))
	
  (set var val)

  ;; Force a thorough redisplay for the case that the variable
  ;; has an effect on the display, like `tab-width' has.
  (force-mode-line-update))

    (if (and mini-p
	     (or (not (active-minibuffer-window))
		 (not (equal buffer
			     (window-buffer (active-minibuffer-window))))))
	(error "Minibuffer is not active for completion")
      (unless (run-hook-with-args-until-success 
	       'choose-completion-string-functions
	       choice buffer mini-p base-size)
	;; Insert the completion into the buffer where it was requested.
	(set-buffer buffer)
	(if base-size

;    (when (consp buffer-undo-list)
;      (setq buffer-undo-list (cddr buffer-undo-list)))
;    (message "You cannot modify the prompt")))
;
;
;(setq minibuffer-prompt-properties 
;  (list 'modification-hooks '(minibuffer-prompt-modification)
;	'insert-in-front-hooks '(minibuffer-prompt-insertion)))
;  

(provide 'simple)
;;; simple.el ends here

49597:e88404e8f2cf

  ;; you must type some other command.
  (setq this-command 'undo)
  (let ((modified (buffer-modified-p))
	(recent-save (recent-auto-save-p)))
    (or (eq (selected-window) (minibuffer-window))
	(message (if (and transient-mark-mode mark-active)
		     "Undo in region!"
		   "Undo!")))
    (unless (eq last-command 'undo)
      (if (if transient-mark-mode mark-active (and arg (not (numberp arg))))
	  (undo-start (region-beginning) (region-end))

(defun undo-more (count)
  "Undo back N undo-boundaries beyond what was already undone recently.
Call `undo-start' to get ready to undo recent changes,
then call `undo-more' one or more times to undo them."
  (or pending-undo-list
      (error (format "No further undo information%s"
		     (if (and transient-mark-mode mark-active)
			 " for region" ""))))
  (let ((undo-in-progress t))
    (setq pending-undo-list (primitive-undo count pending-undo-list))))

;; Deep copy of a list

					     (list buffer error-file)
					   buffer)
					 nil shell-command-switch command)))
	  ;; Report the output.
	  (with-current-buffer buffer
	    (setq mode-line-process
		  (cond ((null exit-status)
			 " - Error")
			((stringp exit-status)
			 (format " - Signal [%s]" exit-status))
			((not (equal 0 exit-status))

If `interprogram-cut-function' is non-nil, apply it to STRING.
Optional second argument REPLACE non-nil means that STRING will replace
the front of the kill ring, rather than being added to the list.

Optional third arguments YANK-HANDLER controls how the STRING is later
inserted into a buffer; see `insert-for-yank' for details.
When a yank handler is specified, STRING must be non-empty (the yank
handler is stored as a `yank-handler'text property on STRING).

When the yank handler has a non-nil PARAM element, the original STRING
argument is not used by `insert-for-yank'.  However, since Lisp code
may access and use elements from the kill-ring directly, the STRING
argument should still be a \"useful\" string for such uses."
  (if (> (length string) 0)
      (if yank-handler
	  (put-text-property 0 1 'yank-handler yank-handler string)
	(remove-list-of-text-properties 0 1 '(yank-handler) string))
    (if yank-handler
	(signal 'args-out-of-range
		(list string "yank-handler specified for empty string"))))
  (if (fboundp 'menu-bar-update-yank-menu)
      (menu-bar-update-yank-menu string (and replace (car kill-ring))))
  (if (and replace kill-ring)
      (setcar kill-ring string)

If BEFORE-P is non-nil, prepend STRING to the kill.
Optional third argument YANK-HANDLER specifies the yank-handler text
property to be set on the combined kill ring string.  If the specified
yank-handler arg differs from the yank-handler property of the latest
kill string, STRING is added as a new kill ring element instead of
being appending to the last kill.
If `interprogram-cut-function' is set, pass the resulting kill to it."
  (let* ((cur (car kill-ring)))
    (kill-new (if before-p (concat string cur) (concat cur string))
	      (or (= (length cur) 0)
		  (equal yank-handler (get-text-property 0 'yank-handler cur)))

If the previous command was also a kill command,
the text killed this time appends to the text killed last time
to make one entry in the kill ring.

In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler
text property to be set on the killed text.  See `insert-for-yank'."
  (interactive "r")
  (condition-case nil
      (let ((string (delete-and-extract-region beg end)))
	(when string			;STRING is nil if BEG = END
	  ;; Add that string to the kill ring, one way or another.

This command works even when the mark is not active,
and it reactivates the mark.
With prefix arg, `transient-mark-mode' is enabled temporarily."
  (interactive "P")
  (if arg
      (if mark-active
	  (if (null transient-mark-mode)
	      (setq transient-mark-mode 'lambda))
	(setq arg nil)))
  (unless arg
    (let ((omark (mark t)))

	  (and prefix (not (equal prefix ""))
	       ;; Use auto-indentation rather than a guessed empty prefix.
	       (not (and fill-indent-according-to-mode
			 (string-match "\\`[ \t]*\\'" prefix)))
	       (setq fill-prefix prefix))))

      (while (and (not give-up) (> (current-column) fc))
	;; Determine where to split the line.
	(let* (after-prefix
	       (fill-point
		(let ((opoint (point)))

	(error "Value `%S' does not match type %S of %S"
	       val (car type) var))))

  (if make-local
      (make-local-variable var))

  (set var val)

  ;; Force a thorough redisplay for the case that the variable
  ;; has an effect on the display, like `tab-width' has.
  (force-mode-line-update))

    (if (and mini-p
	     (or (not (active-minibuffer-window))
		 (not (equal buffer
			     (window-buffer (active-minibuffer-window))))))
	(error "Minibuffer is not active for completion")
      (unless (run-hook-with-args-until-success
	       'choose-completion-string-functions
	       choice buffer mini-p base-size)
	;; Insert the completion into the buffer where it was requested.
	(set-buffer buffer)
	(if base-size

;    (when (consp buffer-undo-list)
;      (setq buffer-undo-list (cddr buffer-undo-list)))
;    (message "You cannot modify the prompt")))
;
;
;(setq minibuffer-prompt-properties
;  (list 'modification-hooks '(minibuffer-prompt-modification)
;	'insert-in-front-hooks '(minibuffer-prompt-insertion)))
;

(provide 'simple)
;;; simple.el ends here