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

[Richard M. Stallman]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.324 emacs/lisp/subr.el:1.325
*** emacs/lisp/subr.el:1.324    Fri Sep 27 15:44:05 2002
--- emacs/lisp/subr.el  Sat Sep 28 23:31:15 2002
***************
*** 1431,1449 ****
        (while (< (point) end)
          (let ((cat (get-text-property (point) 'category))
                run-end)
-           (when cat
-             (setq run-end
-                   (next-single-property-change (point) 'category nil end))
-             (remove-list-of-text-properties (point) run-end '(category))
-             (add-text-properties (point) run-end (symbol-plist cat))
-             (goto-char (or run-end end)))
            (setq run-end
                  (next-single-property-change (point) 'category nil end))
!           (goto-char (or run-end end))))))
      (if (eq yank-excluded-properties t)
        (set-text-properties start end nil)
!       (remove-list-of-text-properties start end
!                                     yank-excluded-properties))))
  
  (defun insert-for-yank (&rest strings)
    "Insert STRINGS at point, stripping some text properties.
--- 1431,1451 ----
        (while (< (point) end)
          (let ((cat (get-text-property (point) 'category))
                run-end)
            (setq run-end
                  (next-single-property-change (point) 'category nil end))
!           (when cat
!             (let (run-end2 original)
!               (remove-list-of-text-properties (point) run-end '(category))
!               (while (< (point) run-end)
!                 (setq run-end2 (next-property-change (point) nil run-end))
!                 (setq original (text-properties-at (point)))
!                 (set-text-properties (point) run-end2 (symbol-plist cat))
!                 (add-text-properties (point) run-end2 original)
!                 (goto-char run-end2))))
!           (goto-char run-end)))))
      (if (eq yank-excluded-properties t)
        (set-text-properties start end nil)
!       (remove-list-of-text-properties start end yank-excluded-properties))))
  
  (defun insert-for-yank (&rest strings)
    "Insert STRINGS at point, stripping some text properties.