diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-06-10 21:20:58 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-06-10 21:20:58 +0800 |
| commit | 31ca4639ad1bfaa355a3f30ef92eb977bd2c6b78 (patch) | |
| tree | 77814646f8df2d6c463fe0052ff25f8635d410b5 /lisp | |
| parent | c758c4fd178a3778b7e6f235af41a898a8e7b972 (diff) | |
| parent | edcdbe4d3121ac663c2c72fce5b69a59c86ecaa1 (diff) | |
| download | emacs-31ca4639ad1bfaa355a3f30ef92eb977bd2c6b78.tar.gz emacs-31ca4639ad1bfaa355a3f30ef92eb977bd2c6b78.tar.bz2 emacs-31ca4639ad1bfaa355a3f30ef92eb977bd2c6b78.zip | |
Merge from emacs-24; up to 2012-04-25T15:23:19Z!sdl.web@gmail.com
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/allout-widgets.el | 2 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 2 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c83b4453922..c159d04443a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2012-06-10 Glenn Morris <rgm@gnu.org> + + * mail/rmail.el (rmail-yank-current-message): Leave point at + correct position. (Bug#11660) + +2012-06-10 Chong Yidong <cyd@gnu.org> + + * allout-widgets.el: Fix code header. + +2012-06-10 Chong Yidong <cyd@gnu.org> + + * cus-edit.el (customize-changed-options-previous-release): Bump + to 24.1. + 2012-06-09 Andreas Schwab <schwab@linux-m68k.org> * Makefile.in (BIG_STACK_DEPTH): Enlarge to 2200. diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 6a5b0d5f7bf..962a8fb557a 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -64,7 +64,7 @@ ;; systematically couple overlays, graphics, and other features with ;; allout-governed text. -;;;_: Code (structured with comments that delineate an allout outline) +;;; Code: ;;;_ : General Environment (require 'allout) diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index b220e7a5ff2..0ee2ea4a8bf 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1159,7 +1159,7 @@ Show the buffer in another window, but don't select it." (unless (eq symbol basevar) (message "`%s' is an alias for `%s'" symbol basevar)))) -(defvar customize-changed-options-previous-release "23.1" +(defvar customize-changed-options-previous-release "24.1" "Version for `customize-changed-options' to refer back to by default.") ;; Packages will update this variable, so make it available. diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index cd2a961638e..9fe8f28a59f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -3589,7 +3589,7 @@ If BUFFER is not swapped, yank out of its message viewer buffer." (with-current-buffer buffer (unless (rmail-buffers-swapped-p) (setq buffer rmail-view-buffer))) - (insert-buffer buffer) + (insert-buffer-substring buffer) ;; If they yank the text of BUFFER, the encoding of BUFFER is a ;; better default for the reply message than the default value of ;; buffer-file-coding-system. |