procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2012-04-18 09:45:13 -07:00
commit 6c94c34fe8
11 changed files with 71 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,4 +1,4 @@
2012-04-17 Paul Eggert <eggert@cs.ucla.edu>
2012-04-18 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
I have been using this change for many months in my private copy

2
lib-src/ChangeLog
View file

@ -1,4 +1,4 @@
2012-04-17 Paul Eggert <eggert@cs.ucla.edu>
2012-04-18 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
* Makefile.in (C_WARNINGS_SWITCH): Remove.

24
lisp/ChangeLog
View file

@ -1,3 +1,27 @@
2012-04-18 Chong Yidong <cyd@gnu.org>
* simple.el (line-move): Use forward-line if in batch mode
(Bug#11053).
2012-04-18 Christopher Schmidt <christopher@ch.ristopher.com>
* files.el (after-find-file): Do not try to add a final newline if
the buffer is read-only (Bug#11156).
2012-04-17 Richard Stallman <rms@gnu.org>
* mail/rmail.el (rmail-start-mail):
Pass (rmail-mail-return...) for the return-action.
Pass (rmail-yank-current-message...) for the yank-action.
(rmail-yank-current-message): New function.
(rmail-mail): Pass the Rmail buffer, not view buffer, for replybuffer.
(rmail-reply): Likewise.
(rmail-forward): Pass the Rmail buffer, not nil, for replybuffer.
* mail/sendmail.el (mail-bury): Choose the first rmail-mode
buffer, not the last. Reject temp buffers. Use the rmail-mode
buffer, not newbuf.
2012-04-17 Juanma Barranquero <lekktu@gmail.com>
* server.el (server-ensure-safe-dir): Simplify.

1
lisp/files.el
View file

@ -2152,6 +2152,7 @@ unless NOMODES is non-nil."
(/= (char-after (1- (point-max))) ?\n)
(not (and (eq selective-display t)
(= (char-after (1- (point-max))) ?\r)))
(not buffer-read-only)
(save-excursion
(goto-char (point-max))
(insert "\n")))

23
lisp/mail/rmail.el
View file

@ -3560,6 +3560,16 @@ does not pop any summary buffer."
;;;; *** Rmail Mailing Commands ***
(defun rmail-yank-current-message (buffer)
"Yank into the current buffer the current message of Rmail buffer BUFFER.
If BUFFER is swapped with its message viewer buffer, yank out of BUFFER.
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))
(defun rmail-start-mail (&optional noerase to subject in-reply-to cc
replybuffer sendactions same-window
other-headers)
@ -3571,7 +3581,8 @@ does not pop any summary buffer."
(if replybuffer
;; The function used here must behave like insert-buffer wrt
;; point and mark (see doc of sc-cite-original).
(setq yank-action (list 'insert-buffer replybuffer)))
(setq yank-action
`(rmail-yank-current-message ,replybuffer)))
(push (cons "cc" cc) other-headers)
(push (cons "in-reply-to" in-reply-to) other-headers)
(setq other-headers
@ -3587,7 +3598,7 @@ does not pop any summary buffer."
(prog1
(compose-mail to subject other-headers noerase
switch-function yank-action sendactions
`(rmail-mail-return ,replybuffer))
(if replybuffer `(rmail-mail-return ,replybuffer)))
(if (eq switch-function 'switch-to-buffer-other-frame)
;; This is not a standard frame parameter; nothing except
;; sendmail.el looks at it.
@ -3644,7 +3655,7 @@ to switch to."
While composing the message, use \\[mail-yank-original] to yank the
original message into it."
(interactive)
(rmail-start-mail nil nil nil nil nil rmail-view-buffer))
(rmail-start-mail nil nil nil nil nil rmail-buffer))
;; FIXME should complain if there is nothing to continue.
(defun rmail-continue ()
@ -3731,9 +3742,7 @@ use \\[mail-yank-original] to yank the original message into it."
(mail-strip-quoted-names
(if (null cc) to (concat to ", " cc))))))
(if (string= cc-list "") nil cc-list)))
(if (rmail-buffers-swapped-p)
rmail-buffer
rmail-view-buffer)
rmail-buffer
(list (list 'rmail-mark-message
rmail-buffer
(with-current-buffer rmail-buffer
@ -3835,7 +3844,7 @@ see the documentation of `rmail-resend'."
(or (mail-fetch-field "Subject") "")
"]")))
(if (rmail-start-mail
nil nil subject nil nil nil
nil nil subject nil nil rmail-buffer
(list (list 'rmail-mark-message
forward-buffer
(with-current-buffer rmail-buffer

7
lisp/mail/sendmail.el
View file

@ -863,8 +863,11 @@ Prefix arg means don't delete this window."
;; even if this message was not started by an Rmail command.
(unless return-action
(dolist (buffer (buffer-list))
(if (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
(setq return-action `(rmail-mail-return ,newbuf)))))
(if (and (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
(null return-action)
;; Don't match message-viewer buffer.
(not (string-match "\\` " (buffer-name buffer))))
(setq return-action `(rmail-mail-return ,buffer)))))
(if (and (null arg) return-action)
(apply (car return-action) (cdr return-action))
(switch-to-buffer newbuf))))

36
lisp/simple.el
View file

@ -4405,23 +4405,25 @@ lines."
;; a cleaner solution to the problem of making C-n do something
;; useful given a tall image.
(defun line-move (arg &optional noerror to-end try-vscroll)
(unless (and auto-window-vscroll try-vscroll
;; Only vscroll for single line moves
(= (abs arg) 1)
;; But don't vscroll in a keyboard macro.
(not defining-kbd-macro)
(not executing-kbd-macro)
(line-move-partial arg noerror to-end))
(set-window-vscroll nil 0 t)
(if (and line-move-visual
;; Display-based column are incompatible with goal-column.
(not goal-column)
;; When the text in the window is scrolled to the left,
;; display-based motion doesn't make sense (because each
;; logical line occupies exactly one screen line).
(not (> (window-hscroll) 0)))
(line-move-visual arg noerror)
(line-move-1 arg noerror to-end))))
(if noninteractive
(forward-line arg)
(unless (and auto-window-vscroll try-vscroll
;; Only vscroll for single line moves
(= (abs arg) 1)
;; But don't vscroll in a keyboard macro.
(not defining-kbd-macro)
(not executing-kbd-macro)
(line-move-partial arg noerror to-end))
(set-window-vscroll nil 0 t)
(if (and line-move-visual
;; Display-based column are incompatible with goal-column.
(not goal-column)
;; When the text in the window is scrolled to the left,
;; display-based motion doesn't make sense (because each
;; logical line occupies exactly one screen line).
(not (> (window-hscroll) 0)))
(line-move-visual arg noerror)
(line-move-1 arg noerror to-end)))))
;; Display-based alternative to line-move-1.
;; Arg says how many lines to move. The value is t if we can move the

2
lwlib/ChangeLog
View file

@ -1,4 +1,4 @@
2012-04-17 Paul Eggert <eggert@cs.ucla.edu>
2012-04-18 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
* Makefile.in (C_WARNINGS_SWITCH): Remove.

2
msdos/ChangeLog
View file

@ -1,4 +1,4 @@
2012-04-17 Paul Eggert <eggert@cs.ucla.edu>
2012-04-18 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
* sed1v2.inp, sed3v2.inp, sedlibmk.inp: GNULIB_WARN_CFLAGS,

2
oldXMenu/ChangeLog
View file

@ -1,4 +1,4 @@
2012-04-17 Paul Eggert <eggert@cs.ucla.edu>
2012-04-18 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
* Makefile.in (C_WARNINGS_SWITCH): Remove.

2
src/ChangeLog
View file

@ -1,4 +1,4 @@
2012-04-17 Paul Eggert <eggert@cs.ucla.edu>
2012-04-18 Paul Eggert <eggert@cs.ucla.edu>
configure: new option --enable-gcc-warnings (Bug#11207)
* Makefile.in (C_WARNINGS_SWITCH): Remove.