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

[Richard M. Stallman]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.297 emacs/lisp/subr.el:1.298
*** emacs/lisp/subr.el:1.297    Wed Apr 10 10:55:19 2002
--- emacs/lisp/subr.el  Thu Apr 18 20:06:54 2002
***************
*** 1023,1028 ****
--- 1023,1030 ----
        (message nil)
        (or pass default ""))))
  
+ ;;; Atomic change groups.
+ 
  (defmacro atomic-change-group (&rest body)
    "Perform BODY as an atomic change group.
  This means that if BODY exits abnormally,
***************
*** 1269,1274 ****
--- 1271,1295 ----
  
  (defalias 'user-original-login-name 'user-login-name)
  
+ (defvar yank-excluded-properties)
+ 
+ (defun insert-for-yank (&rest strings)
+   "Insert STRINGS at point, stripping some text properties.
+ Strip text properties from the inserted text
+ according to `yank-excluded-properties'.
+ Otherwise just like (insert STRINGS...)."
+   (let ((opoint (point)))
+ 
+     (apply 'insert strings)
+ 
+     (let ((inhibit-read-only t))
+       (if (eq yank-excluded-properties t)
+         (set-text-properties opoint (point) nil)
+       (remove-list-of-text-properties opoint (point)
+                                       yank-excluded-properties)))))
+ 
+ ;; Synchronous shell commands.
+ 
  (defun start-process-shell-command (name buffer &rest args)
    "Start a program in a subprocess.  Return the process object for it.
  Args are NAME BUFFER COMMAND &rest COMMAND-ARGS.
***************
*** 1473,1478 ****
--- 1494,1501 ----
           (set-buffer ,old-buffer)
           (set-syntax-table ,old-table))))))
  
+ ;;; Matching and substitution
+ 
  (defvar save-match-data-internal)
  
  ;; We use save-match-data-internal as the local variable because
***************
*** 1875,1881 ****
                (nconc found (list (cons toggle keymap)) rest))
            (setq minor-mode-map-alist (cons (cons toggle keymap)
                                             minor-mode-map-alist))))))))
! 
  ;; Clones ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (defun text-clone-maintain (ol1 after beg end &optional len)
--- 1898,1904 ----
                (nconc found (list (cons toggle keymap)) rest))
            (setq minor-mode-map-alist (cons (cons toggle keymap)
                                             minor-mode-map-alist))))))))
! 
  ;; Clones ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (defun text-clone-maintain (ol1 after beg end &optional len)
***************
*** 1970,1976 ****
      ;;(overlay-put ol2 'face 'underline)
      (overlay-put ol2 'evaporate t)
      (overlay-put ol2 'text-clones dups)))
! 
  (defun play-sound (sound)
    "SOUND is a list of the form `(sound KEYWORD VALUE...)'.
  The following keywords are recognized:
--- 1993,1999 ----
      ;;(overlay-put ol2 'face 'underline)
      (overlay-put ol2 'evaporate t)
      (overlay-put ol2 'text-clones dups)))
! 
  (defun play-sound (sound)
    "SOUND is a list of the form `(sound KEYWORD VALUE...)'.
  The following keywords are recognized: