comparison lisp/emacs-lisp/lisp-mode.el @ 21490:366a1d025c6c

(eval-defun): Arrange to use eval-region even if we have to alter the form.

21489:a1a2beb0a09c

  "Evaluate defun that point is in or before.
Print value in minibuffer.
With argument, insert value in current buffer after the defun."
  (interactive "P")
  (let ((standard-output (if eval-defun-arg-internal (current-buffer) t))
	(form (save-excursion
		(end-of-defun)
		(beginning-of-defun)
		(read (current-buffer)))))
    (cond ((and (eq (car form) 'defvar)
		(cdr-safe (cdr-safe form)))
	   ;; Force variable to be bound.
	   (setq form (cons 'defconst (cdr form))))
	  ((and (eq (car form) 'defcustom)
		(default-boundp (nth 1 form)))
	   ;; Force variable to be bound.
	   (set-default (nth 1 form) (eval (nth 2 form)))))
    (prin1 (eval form))))

(defun lisp-comment-indent ()
  (if (looking-at "\\s<\\s<\\s<")
      (current-column)
    (if (looking-at "\\s<\\s<")

21490:366a1d025c6c

  "Evaluate defun that point is in or before.
Print value in minibuffer.
With argument, insert value in current buffer after the defun."
  (interactive "P")
  (let ((standard-output (if eval-defun-arg-internal (current-buffer) t))
	 end form)
    ;; Read the form from the buffer, and record where it ends.
    (save-excursion
      (end-of-defun)
      (beginning-of-defun)
      (setq form (read (current-buffer)))
      (setq end (point)))
    ;; Alter the form if necessary.
    (cond ((and (eq (car form) 'defvar)
		(cdr-safe (cdr-safe form)))
	   ;; Force variable to be bound.
	   (setq form (cons 'defconst (cdr form))))
	  ((and (eq (car form) 'defcustom)
		(default-boundp (nth 1 form)))
	   ;; Force variable to be bound.
	   (set-default (nth 1 form) (eval (nth 2 form)))))
    ;; Now arrange for eval-region to "read" the (possibly) altered form.
    ;; eval-region handles recording which file defines a function or variable.
    (save-excursion
      (let ((load-read-function
	     #'(lambda (ignore)
		 ;; Skipping to the end of the specified region
		 ;; will make eval-region return.
		 (goto-char end)
		 form)))
	(eval-region (point) end standard-output)))))

(defun lisp-comment-indent ()
  (if (looking-at "\\s<\\s<\\s<")
      (current-column)
    (if (looking-at "\\s<\\s<")