(x_set_scroll_bar_width): Default the width to 3 cols. Call change_frame_size.
(x_scroll_bar_expose): Use VERTICAL_SCROLL_BAR_WIDTH_TRIM. (XTchange_line_highlight, dumpglyphs, XTclear_end_of_line) (do_line_dance, pixel_to_glyph_coords): Use FRAME_WINDOW_WIDTH. (x_scroll_bar_move, x_scroll_bar_create): Add a border around the actual window. (x_scroll_bar_expose): Don't trim the width here.
(post-command-idle-hook): Defvar deleted. (edebug-outside-post-command-idle-hook): Defvar deleted. (edebug-enter): Don't look at or set post-command-idle-hook. (edebug-outside-excursion): Likewise. (edebug-emacs-19-specific): Don't define read-expression-history and read-expression-map.
(coordinates_in_window): Use WINDOW_LEFT_MARGIN, WINDOW_RIGHT_MARGIN, and WINDOW_RIGHT_EDGE. Adjust for left-side scroll bar margin. (window_loop, Fdisplay_buffer): Use new WINDOW_FULL_WIDTH_P macro. (window_internal_width): Window width now always includes the scroll bar, if any. Use WINDOW_RIGHTMOST_P and WINDOW_FULL_WIDTH_P.
(scroll-bar-side): New variable. (toggle-scroll-bar): Use scroll-bar-side.
(archive-write-file-member): Set buffer-file-type only if default-buffer-file-type is bound. (buffer-file-type): Don't make this buffer-local or permanent. Just don't mess with it.
(bib-capitalize-title-stop-regexp): Renamed from capit... (bib-capitalize-title-region): Renamed from capitalize... (bib-capitalize-title): Renamed from capitalize...
(r2b-capitalize-title-stop-regexp): Renamed from capit... (r2b-capitalize-title-region): Renamed from capitalize... (r2b-capitalize-title): Renamed from capitalize...
(jump-to-register): Handle file-query. (register-swap-out): New function. Add it to kill-buffer-hook. (register-alist): Doc fix.
(byte-compile-save-current-buffer): New function.
Keep subalists at top level too. Name the split-off submenus from the first item in them. (imenu--generic-function): Avoid adding nil as elt of the result.