bug#29763: New Feature: Remove unneeded eval-expression in minibuffer-history

[Robert Weiner <rsw@gnu.org>]

[-- Attachment #1.1: Type: text/plain, Size: 833 bytes --]

On Fri, Dec 22, 2017 at 7:58 AM, Andreas Schwab <schwab@linux-m68k.org>
wrote:

> On Dez 17 2017, Robert Weiner <rsw@gnu.org> wrote:
>
> > + (defun minibuffer-history-edit-element (elt)
> > +   "Automatically simplify ELT if possible, e.g. removing
> eval-expression."
> > +   (or (and (consp elt) (eq (car elt) 'eval-expression)
> > +        ;; Remove eval-expression wrapper and leave just the expression.
> > +        (cadadr elt))
>
> That mishandles self-evaluating expressions, they are not wrapped with
> quote.
>

​You are correct.  This version resolves that issue and changes
repeat-complex-command to use eval-expression instead of
funcall-interactively to handle expressions rather than function
calls, including properly redoing:

   (quote emacs-version)

for example.

See attached.

Bob

[-- Attachment #1.2: Type: text/html, Size: 2467 bytes --]

[-- Attachment #2: simple.el.patch --]
[-- Type: application/octet-stream, Size: 2439 bytes --]

*** simple-orig.el.gz	2017-12-22 09:15:29.000000000 -0500
--- simple.el.gz	2017-12-22 09:15:29.000000000 -0500
***************
*** 1563,1572 ****
--- 1563,1581 ----
                          (eval-expression-print-format (car values)))))
            (when str (princ str out)))))))
  
+ (defun minibuffer-history-edit-element (elt)
+   "Automatically simplify ELT if possible, e.g. removing eval-expression."
+     (when (and (consp elt) (eq (car elt) 'eval-expression))
+       (setq elt (cadr elt))
+       (when (and (consp elt) (eq (car elt) 'quote))
+ 	(setq elt (cadr elt))))
+     elt)
+ 
  (defun edit-and-eval-command (prompt command)
    "Prompting with PROMPT, let user edit COMMAND and eval result.
  COMMAND is a Lisp expression.  Let user edit that expression in
  the minibuffer, then read and evaluate the result."
+   (setq command (minibuffer-history-edit-element command))
    (let ((command
  	 (let ((print-level nil)
  	       (minibuffer-history-sexp-flag (1+ (minibuffer-depth))))
***************
*** 1601,1606 ****
--- 1610,1616 ----
  	newcmd)
      (if elt
  	(progn
+ 	  (setq elt (minibuffer-history-edit-element elt))
  	  (setq newcmd
  		(let ((print-level nil)
  		      (minibuffer-history-position arg)
***************
*** 1620,1628 ****
  	  ;; add it to the history.
  	  (or (equal newcmd (car command-history))
  	      (setq command-history (cons newcmd command-history)))
!           (apply #'funcall-interactively
! 		 (car newcmd)
! 		 (mapcar (lambda (e) (eval e t)) (cdr newcmd))))
        (if command-history
  	  (error "Argument %d is beyond length of command history" arg)
  	(error "There are no previous complex commands to repeat")))))
--- 1630,1636 ----
  	  ;; add it to the history.
  	  (or (equal newcmd (car command-history))
  	      (setq command-history (cons newcmd command-history)))
! 	  (eval-expression newcmd))
        (if command-history
  	  (error "Argument %d is beyond length of command history" arg)
  	(error "There are no previous complex commands to repeat")))))
***************
*** 2070,2075 ****
--- 2078,2084 ----
  	   (setq minibuffer-text-before-history nil))
  	  (t (setq elt (nth (1- minibuffer-history-position)
  			    (symbol-value minibuffer-history-variable)))))
+     (setq elt (minibuffer-history-edit-element elt))
      (insert
       (if (and (eq minibuffer-history-sexp-flag (minibuffer-depth))
  	      (not minibuffer-returned-to-present))