[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/simple.el
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/simple.el |
Date: |
Wed, 19 Nov 2003 08:23:31 -0500 |
Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.623 emacs/lisp/simple.el:1.624
*** emacs/lisp/simple.el:1.623 Sat Nov 1 12:01:36 2003
--- emacs/lisp/simple.el Wed Nov 19 08:23:30 2003
***************
*** 3830,3854 ****
(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))
! (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 var)
(not (get var 'custom-type))
--- 3830,3854 ----
(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))
! (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 var)
(not (get var 'custom-type))