emacs, branch pending Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from trunk 2012-03-25T20:37:21+00:00 Stefan Monnier 2012-03-25T20:37:21+00:00 699c782b7668c44d0fa4446331b0590a6d5dac82 






* lisp/newcomment.el (comment-inline-offset): Don't autoload.
2012-03-25T18:41:06+00:00

Stefan Monnier

2012-03-25T18:41:06+00:00

98fb480ee31bf74cf554044f60f21df16566dd7f

(comment-choose-indent): Obey comment-inline-offset.





(comment-choose-indent): Obey comment-inline-offset.







* lisp/newcomment.el (comment-inline-offset): New custom var.
2012-03-25T18:37:24+00:00

Philipp Haselwarter

2012-03-25T18:37:24+00:00

8eb5d48f36bbb758d46a867c52fbc23d7ad7d71f

(comment-indent): Use it.

Fixes: debbugs:11090





(comment-indent): Use it.

Fixes: debbugs:11090







Fix bug #11073 with bidi-related crashes displaying some byte sequences.
2012-03-23T12:32:23+00:00

Eli Zaretskii

2012-03-23T12:32:23+00:00

e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf

 src/bidi.c (bidi_fetch_char): Use STRING_CHAR_AND_LENGTH instead of
 FETCH_MULTIBYTE_CHAR followed by CHAR_BYTES.  Prevents crashes
 when fetching a multibyte character consumes more bytes than
 CHAR_BYTES returns, due to unification of CJK characters in
 string_char.





 src/bidi.c (bidi_fetch_char): Use STRING_CHAR_AND_LENGTH instead of
 FETCH_MULTIBYTE_CHAR followed by CHAR_BYTES.  Prevents crashes
 when fetching a multibyte character consumes more bytes than
 CHAR_BYTES returns, due to unification of CJK characters in
 string_char.







* src/process.c (wait_reading_process_output): Handle pty disconnect
2012-03-23T12:23:14+00:00

Troels Nielsen

2012-03-23T12:23:14+00:00

5063c0e1a29078fb72ef5e48e1eeed6a863128ac

by refraining from sending oneself a SIGCHLD.

Fixes: debbugs:10933





by refraining from sending oneself a SIGCHLD.

Fixes: debbugs:10933







Merge changes made in No Gnus
2012-03-23T11:22:21+00:00

Gnus developers

2012-03-23T11:22:21+00:00

005a89ffd3550983ca3c85334d79c7fad633c9c0

2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * auth-source.el (auth-source-netrc-create): Quote tokens that contain
 "#" to avoid having them interpreted as comments.
2012-03-22  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
 * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
 reflect the new default.





2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * auth-source.el (auth-source-netrc-create): Quote tokens that contain
 "#" to avoid having them interpreted as comments.
2012-03-22  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
 * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
 reflect the new default.







* lisp/newcomment.el (comment-choose-indent): No space after BOL.
2012-03-23T02:46:31+00:00

Stefan Monnier

2012-03-23T02:46:31+00:00

b9d0879b49887a1db7630be9cab7fb60cf09cfd3












* lisp/window.el (switch-to-prev-buffer): Revert last patch because the
2012-03-22T20:49:04+00:00

Sam Steingold

2012-03-22T20:49:04+00:00

e71cebb3c3a3b2f7eb5a28178d9c4763a1a3edb0

bug turned out to be an advertised feature (Elisp manual 28.14).





bug turned out to be an advertised feature (Elisp manual 28.14).







Tweak previous vz-bzr change yet again
2012-03-22T19:57:43+00:00

Glenn Morris

2012-03-22T19:57:43+00:00

9e1a1109f7ba74795897cbcb4cb9bbc5d4046bf6












Tweak previous vc-bzr change
2012-03-22T19:17:43+00:00

Glenn Morris

2012-03-22T19:17:43+00:00

b4715d2a084182032d1c7de5527818bf0a2d4a41