aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2003-08-29 16:20:18 +0000
committerRichard M. Stallman2003-08-29 16:20:18 +0000
commit0e874d89541297d35150292aea8aab3f83d5fd7d (patch)
tree2667b43465e428bb1361ef20864cae0b98d1719d
parent92b0e747c4a3e5c84e696d3bd59a175ba2617ec8 (diff)
downloademacs-0e874d89541297d35150292aea8aab3f83d5fd7d.tar.gz
emacs-0e874d89541297d35150292aea8aab3f83d5fd7d.zip
Comment change.
-rw-r--r--lisp/desktop.el5
-rw-r--r--lisp/subr.el2
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index e4ce71ec71d..d941b606b81 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -37,10 +37,9 @@
37;; - buffer-read-only 37;; - buffer-read-only
38;; - some local variables 38;; - some local variables
39 39
40;; To use this, add these lines in the bottom of your .emacs file: 40;; To use this, add these lines to the bottom of your .emacs file:
41;; 41;;
42;; (desktop-load-default) 42;; (require 'desktop)
43;; (desktop-read)
44;; (setq desktop-enable t) 43;; (setq desktop-enable t)
45;; 44;;
46;; Between the first two lines you may wish to add something that updates the 45;; Between the first two lines you may wish to add something that updates the
diff --git a/lisp/subr.el b/lisp/subr.el
index 78d3a755f14..7e2e0e3e304 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1550,6 +1550,8 @@ BUFFER may be a buffer or a buffer name. Arguments START and END are
1550character numbers specifying the substring. They default to the 1550character numbers specifying the substring. They default to the
1551beginning and the end of BUFFER. Strip text properties from the 1551beginning and the end of BUFFER. Strip text properties from the
1552inserted text according to `yank-excluded-properties'." 1552inserted text according to `yank-excluded-properties'."
1553 ;; Since the buffer text should not normally have yank-handler properties,
1554 ;; there is no need to handle them here.
1553 (let ((opoint (point))) 1555 (let ((opoint (point)))
1554 (insert-buffer-substring buf start end) 1556 (insert-buffer-substring buf start end)
1555 (remove-yank-excluded-properties opoint (point)))) 1557 (remove-yank-excluded-properties opoint (point))))