xemacs-beta: lisp/prim/simple.el comparison

comparison lisp/prim/simple.el @ 48:56c54cf7c5b6 r19-16b90

Import from CVS: tag r19-16b90

author	cvs
date	Mon, 13 Aug 2007 08:56:04 +0200
parents	e04119814345
children	131b0175ea99

comparison

equal deleted inserted replaced

-:11c6df210d7f
+:56c54cf7c5b6
 ;; this code, but only for text-properties and not full extents. -sb
 ;; If the buffer is read-only, we should beep, in case the person
 ;; just isn't aware of this.  However, there's no harm in putting
 ;; the region's text in the kill ring, anyway.
 ((or (and buffer-read-only (not inhibit-read-only))
-	(text-property-not-all beg end 'read-only nil))
+	(text-property-not-all (min beg end) (max beg end) 'read-only nil))
 ;; This is redundant.
 ;; (if verbose (message "Copying %d characters"
 ;;			 (- (max beg end) (min beg end))))
 (copy-region-as-kill beg end)
 ;; ;; This should always barf, and give us the correct error.
 	  tail)
 (delete-region beg end)
 ;; Search back in buffer-undo-list for this string,
 ;; in case a change hook made property changes.
 (setq tail buffer-undo-list)
-(while (not (stringp (car-safe (car-safe tail)))) ; XEmacs
+(while (and tail
-	(setq tail (cdr tail)))
+		  (not (stringp (car-safe (car-safe tail))))) ; XEmacs
+	(pop tail))
 ;; Take the same string recorded for undo
 ;; and put it in the kill-ring.
-(kill-new (car (car tail)))))
+(and tail
+	   (kill-new (car (car tail))))))
 (t
 ;; if undo is not kept, grab the string then delete it (which won't
 ;; add another string to the undo list).
 (copy-region-as-kill beg end)
 (if before
 	;; This is like exchange-point-and-mark, but doesn't activate the mark.
 	;; It is cleaner to avoid activation, even though the command
 	;; loop would deactivate the mark because we inserted text.
 	(goto-char (prog1 (mark t)
-		     (set-marker (mark-marker) (point) (current-buffer))))))
+		     (set-marker (mark-marker t) (point) (current-buffer))))))
 nil)
 (defun yank (&optional arg)
 "Reinsert the last stretch of killed text.
 you should just use (message nil)."
 (or frame (setq frame (selected-frame)))
 (let ((clear-stream (and message-stack (eq 'stream (frame-type frame)))))
 (remove-message label frame)
 (let ((buffer (get-buffer " *Echo Area*"))
+	  (inhibit-read-only t)
 	  (zmacs-region-stays zmacs-region-stays)) ; preserve from change
 (erase-buffer buffer))
 (if clear-stream
 	(send-string-to-terminal ?\n stdout-p))
 (if no-restore
 	  (run-hook-with-args 'remove-message-hook
 			      (car (car log)) (cdr (car log)))
 	(error (setq remove-message-hook nil)
 	       (message "remove-message-hook error: %s" e)
 	       (sit-for 2)
-	       (erase-buffer (get-buffer " *Echo Area*"))
+	       (let ((inhibit-read-only t))
+		 (erase-buffer (get-buffer " *Echo Area*")))
 	       (signal (car e) (cdr e))))
 (setq log (cdr log)))))
 (defun append-message (label message &optional frame stdout-p)
 (or frame (setq frame (selected-frame)))
 (if (eq message "") nil
 (let ((buffer (get-buffer " *Echo Area*"))
 	  (zmacs-region-stays zmacs-region-stays)) ; preserve from change
 (save-excursion
 	(set-buffer buffer)
-	(insert message))
+	(let ((inhibit-read-only t))
+	  (insert message)))
 ;; Conditionalizing on the device type in this way is not that clean,
 ;; but neither is having a device method, as I originally implemented
 ;; it: all non-stream devices behave in the same way.  Perhaps
 ;; the cleanest way is to make the concept of a "redisplayable"
 ;; device, which stream devices are not.  Look into this more if

Mercurial > hg > xemacs-beta

comparison lisp/prim/simple.el @ 48:56c54cf7c5b6 r19-16b90