[Emacs-diffs] Changes to emacs/lisp/simple.el

[Juri Linkov]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.755 emacs/lisp/simple.el:1.756
*** emacs/lisp/simple.el:1.755  Sun Oct 16 09:31:47 2005
--- emacs/lisp/simple.el        Fri Oct 21 08:55:12 2005
***************
*** 4572,4581 ****
  With a prefix argument, set VARIABLE to VALUE buffer-locally."
    (interactive
     (let* ((default-var (variable-at-point))
!           (var (if (symbolp default-var)
!                       (read-variable (format "Set variable (default %s): " 
default-var)
!                                      default-var)
!                     (read-variable "Set variable: ")))
          (minibuffer-help-form '(describe-variable var))
          (prop (get var 'variable-interactive))
            (obsolete (car (get var 'byte-obsolete-variable)))
--- 4572,4581 ----
  With a prefix argument, set VARIABLE to VALUE buffer-locally."
    (interactive
     (let* ((default-var (variable-at-point))
!           (var (if (user-variable-p default-var)
!                  (read-variable (format "Set variable (default %s): " 
default-var)
!                                 default-var)
!                (read-variable "Set variable: ")))
          (minibuffer-help-form '(describe-variable var))
          (prop (get var 'variable-interactive))
            (obsolete (car (get var 'byte-obsolete-variable)))
***************
*** 4600,4606 ****
                                              arg))
                     (read
                      (read-string prompt nil
!                                  'set-variable-value-history))))))
       (list var val current-prefix-arg)))
  
    (and (custom-variable-p variable)
--- 4600,4607 ----
                                              arg))
                     (read
                      (read-string prompt nil
!                                  'set-variable-value-history
!                                (format "%S" (symbol-value var))))))))
       (list var val current-prefix-arg)))
  
    (and (custom-variable-p variable)