* lisp/progmodes/etags.el (etags-list-tags): Only use tags which goto-func
understands.
Fix starttls-related error message under Windows

* net/network-stream.el (network-stream-open-starttls): Make error
message under Windows be less misleading.
Use bzr status --no-classify when supported (bug#6724)

* lisp/vc/vc-bzr.el (vc-bzr-status-switches): New option.
(vc-bzr-command): If running "status", pass vc-bzr-status-switches.
Tweak previous vc-bzr change
Tweak previous vz-bzr change yet again
* lisp/window.el (switch-to-prev-buffer): Revert last patch because the
bug turned out to be an advertised feature (Elisp manual 28.14).
* lisp/newcomment.el (comment-choose-indent): No space after BOL.
Merge changes made in No Gnus

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.
* src/process.c (wait_reading_process_output): Handle pty disconnect
by refraining from sending oneself a SIGCHLD.
Fix bug #11073 with bidi-related crashes displaying some byte sequences.

 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.
Fixes: debbugs:11080

* xterm.c (XTread_socket): Only modify handling_signal if
!SYNC_INPUT.
* xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6
characters.
* mwheel.el (mwheel-scroll): Call deactivate-mark at the right point.
* vc/vc.el (vc-merge): Fix a prompt.
Fix bug #9960 with MSVC build on MS-Windows.

 src/s/ms-w32.h (tzname): Include time.h before redirecting to
 _tzname.  Fixes the MSVC build.
Updates to Display chapter of Lisp manual.

* doc/lispref/display.texi (Fringes): Note that fringes are shown on graphical
displays only.
(Fringe Size/Pos, Fringe Bitmaps, Making Buttons): Clarifications.
(Replacing Specs): Clarify example.
(Manipulating Buttons): Note that button-at can return a marker.
(Buttons): Minor rewrite.
(Character Display): New node.  Consolidate all character display
related nodes into its subsections.
(Usual Display): Character 127 is also affected by ctl-arrow.
(Display Tables): Improve example.

* lisp/button.el (button-at): Minor addition to docstring.
Fix for custom-theme-write-faces.

* lisp/cus-theme.el (custom-theme-write-faces): Retrieve current face
spec with custom-face-get-current-spec if its :shown-value is not
determined yet.
Fix race condition in url-queue when doing the callback

* url-queue.el (url-queue-kill-job): Check whether the buffer has
been killed asynchronously before selecting it.
Fix interaction of load-theme with cust-theme.el.

* lisp/custom.el (load-theme): Even if NO-ENABLE arg is t, reenable the
theme if it was previously enabled before (Bug#11031).

* lisp/cus-theme.el (customize-create-theme, custom-theme-revert): Doc fixes.
dispextern.h (struct glyph): Change the bit length of glyphless.ch to 22 to make the member glyphless fit in 32 bits.