Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.734 emacs/lisp/simple.el:1.735
*** emacs/lisp/simple.el:1.734 Fri Jun 24 21:11:58 2005
--- emacs/lisp/simple.el Wed Jun 29 23:48:58 2005
***************
*** 4538,4559 ****
(read-variable "Set variable: ")))
(minibuffer-help-form '(describe-variable var))
(prop (get var 'variable-interactive))
! (prompt (format "Set %s%s to value: " var
(cond ((local-variable-p var)
! " (buffer-local)")
((or current-prefix-arg
(local-variable-if-set-p var))
! " buffer-locally")
! (t " globally"))))
! (val (if prop
! ;; Use VAR's `variable-interactive' property
! ;; as an interactive spec for prompting.
! (call-interactively `(lambda (arg)
! (interactive ,prop)
! arg))
! (read
! (read-string prompt nil
! 'set-variable-value-history)))))
(list var val current-prefix-arg)))
(and (custom-variable-p variable)
--- 4538,4566 ----
(read-variable "Set variable: ")))
(minibuffer-help-form '(describe-variable var))
(prop (get var 'variable-interactive))
! (obsolete (car (get var 'byte-obsolete-variable)))
! (prompt (format "Set %s %s to value: " var
(cond ((local-variable-p var)
! "(buffer-local)")
((or current-prefix-arg
(local-variable-if-set-p var))
! "buffer-locally")
! (t "globally"))))
! (val (progn
! (when obsolete
! (message (concat "`%S' is obsolete; "
! (if (symbolp obsolete) "use `%S' instead"
"%s"))
! var obsolete)
! (sit-for 3))
! (if prop
! ;; Use VAR's `variable-interactive' property
! ;; as an interactive spec for prompting.
! (call-interactively `(lambda (arg)
! (interactive ,prop)
! arg))
! (read
! (read-string prompt nil
! 'set-variable-value-history))))))
(list var val current-prefix-arg)))
(and (custom-variable-p variable)
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
