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

[Stefan Monnier]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.610 emacs/lisp/simple.el:1.611
*** emacs/lisp/simple.el:1.610  Mon Jun 16 22:35:46 2003
--- emacs/lisp/simple.el        Tue Jun 17 14:40:06 2003
***************
*** 1811,1818 ****
  argument should still be a \"useful\" string for such uses."
    (if (> (length string) 0)
        (if yank-handler
!         (put-text-property 0 1 'yank-handler yank-handler string)
!       (remove-list-of-text-properties 0 1 '(yank-handler) string))
      (if yank-handler
        (signal 'args-out-of-range
                (list string "yank-handler specified for empty string"))))
--- 1811,1817 ----
  argument should still be a \"useful\" string for such uses."
    (if (> (length string) 0)
        (if yank-handler
!         (put-text-property 0 1 'yank-handler yank-handler string))
      (if yank-handler
        (signal 'args-out-of-range
                (list string "yank-handler specified for empty string"))))
***************
*** 4481,4489 ****
    :group 'display
    :version "21.4")
  
! (make-variable-buffer-local 'saved-buffer-invisibility-spec)
! 
! (defvar saved-buffer-invisibility-spec nil
    "Saved value of buffer-invisibility-spec when `vis-mode' is on.")
  
  (define-minor-mode vis-mode
--- 4480,4486 ----
    :group 'display
    :version "21.4")
  
! (defvar vis-mode-saved-buffer-invisibility-spec nil
    "Saved value of buffer-invisibility-spec when `vis-mode' is on.")
  
  (define-minor-mode vis-mode
***************
*** 4498,4509 ****
  Disabling vis-mode restores the saved value of
  `buffer-invisibility-spec'."
    :lighter " Vis"
!   (if vis-mode
!       (progn
!       (setq saved-buffer-invisibility-spec buffer-invisibility-spec
!             buffer-invisibility-spec nil))
!     (setq buffer-invisibility-spec saved-buffer-invisibility-spec
!         saved-buffer-invisibility-spec nil)))
  
  ;; Minibuffer prompt stuff.
  
--- 4495,4507 ----
  Disabling vis-mode restores the saved value of
  `buffer-invisibility-spec'."
    :lighter " Vis"
!   (when (local-variable-p 'vis-mode-saved-buffer-invisibility-spec)
!     (setq buffer-invisibility-spec vis-mode-saved-buffer-invisibility-spec)
!     (kill-local-variable 'vis-mode-saved-buffer-invisibility-spec))
!   (when vis-mode
!     (set (make-local-variable 'vis-mode-saved-buffer-invisibility-spec)
!        buffer-invisibility-spec)
!     (setq buffer-invisibility-spec nil)))
  
  ;; Minibuffer prompt stuff.