(diff-default-read-only): Change default.
(diff-mode-hook): Make it a defcustom.  Add some options.
(diff-mode-map): Bind diff-refine-hook.
(diff-yank-handler): New var.
(diff-yank-function): New fun.
(diff-font-lock-keywords): Use them.
(diff-end-of-file): Handle case where file-header looks like diff text.
(diff-hunk-kill): Adjust to "new" hunk-next behavior.
(diff-file-kill): Delete a subsequent empty line, if applicable.
(diff-hunk-file-names): New fun, extracted from diff-tell-file-name.
(diff-find-file-name): Use it.
(diff-tell-file-name): New command.
(diff-mode): Be careful with view-mode.
(diff-delete-if-empty, diff-delete-empty-files, diff-make-unified):
New functions, for use in diff-mode-hook.
(diff-find-source-location): Catch "regex too large" errors.
(diff-apply-hunk, diff-test-hunk): Go to old or new file.
(diff-refine-hunk): New command.

(smerge-mode-menu): Fix activate pred for resolve.
(smerge-context-menu-map): Remove unused var.
(smerge-keep-all): Preserve markers.
(smerge-keep-n): New fun.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-ediff): Use it.
(smerge-kill-current): Use it.  Make it work on some 3-part conflicts.
(smerge-popup-context-menu): Also use context-menu on 3-part conflicts.
(smerge-resolve): Resolve trivial 3-part conflicts.

(display-time-string-forms): Fix help-echo date format.

Move suggestions for key bindings to Commentary.

(dired-compress-file-suffixes): Add dz and tbz.
(dired-compare-directories): Add default value for empty input.

(dired-guess-shell-alist-default): Add choices for
extracting files into subdirectory.  Add tbz and dz.  Fix regexps.
Add extensions .[0-9] for man and nroff, and .pod for perldoc.
(dired-man): Use dired-guess-shell-command.
(dired-guess-shell-case-fold-search): Change defvar to defcustom.
Change default nil to t.

(jka-compr-compression-info-list): Add tbz and dz.
(jka-compr-mode-alist-additions): Add tbz.
(jka-compr-write-region): Add error message for undefined compress-program.
(jka-compr-insert-file-contents): Add message for undefined compress-program.
(jka-compr-write-region): Remove redundant var bindings.

(quail-insert-decode-map): Use window-width instead of frame-width.

(describe-current-coding-system): Use window-width instead of frame-width.

(describe-char): Use window-width instead of frame-width.

(list-one-abbrev-table): Use window-width instead of frame-width.

(woman-fill-frame): Doc fix.
(woman-decode-region): Use window-width instead of frame-width.

(Man-width): New var.
(Man-getpage-in-background): Use it.
(Man-support-local-filenames): New var and fun.
(Man-build-man-command): Don't add a second %s.
(Man-fontify-manpage): Clean up message.
(Man-mode): Set outline-regexp, outline-level, imenu-generic-expression.

(global-auto-revert-non-file-buffers): Expand doc string.
(buffer-stale-function): New variable.
(auto-revert-list-diff, auto-revert-dired-file-list)
(auto-revert-dired-changed-p, auto-revert-buffer-p): Delete.
(auto-revert-handler): Take over some functionality of deleted functions.
(auto-revert-buffers): Delete call to auto-revert-buffer-p.

(dired-directory-changed-p, dired-buffer-stale-p): New functions.
(dired-internal-noselect): Use dired-directory-changed-p.
Eliminate revert messages.
(dired-mode): Set buffer-stale-function to dired-buffer-stale-p.

Setup syntaxes for more parentheses Unicode characters.

(ad-subr-arglist): Undo part of last patch.

(select-safe-coding-system): Merge
coding-system and auto-cs before comparing them.

Fix copyright.

Fix copyright.

(pp-eval-expression): Simplify.

(lisp-mode-variables): Don't set
normal-auto-fill-function and comment-indent-function.
The default values now work just as well.
Don't set font-lock-beginning-of-syntax-function since we already set
syntax-begin-function.
(lisp-outline-level): Put ;;;###autoload at same level as (.
(prin1-char): Quote special chars.

(lm-keywords-finder-p): Use defvar rather than with-no-warnings.

(edebug-display): Bring up a debug trace if the source location can't be found.
(edebug-compute-previous-result): Use prin1-char.

(checkdoc-error): Dont' assume point-min == 1.
(debug-ignored-errors): Add an entry.

(byte-recompile-directory): Ignore hidden dir.
(byte-compile-file): Output warning when deleting a file.

(defsubst): Add edebug spec and use backquote.
(dont-compile, eval-when-compile, eval-and-compile): Add edebug spec.

(byte-compile-log-lap, byte-compile-inline-expand): Use backquote.
(byte-optimize-pure-func): Rename from byte-optimize-concat.
(symbol-name, regexp-opt, regexp-quote): Mark as pure.

(backquote-list*-macro): Use nreverse.

(ad-subr-arglist): Simplify.

Use inhibit-read-only instead of buffer-read-only.
(gnus-narrow-to-page): Don't assume point-min == 1.
(gnus-article-edit-mode): Derive from message-mode.
(gnus-button-alist): Add buttons to (info "(emacs)Keymaps").

(gnus-score-find-bnews): Simplify and don't assume point-min == 1.

(imap-parse-address-list, imap-parse-body-ext): Disable wrong use of `assert'.

Add local variables to prevent byte-compiling.

*** empty log message ***

(ispell-help): Doc fix.

Doc fix.

(ethio-find-file): Doc fix.

Fix keywords.

(finder-known-keywords): Fix data, tex, unix.

Fix typo.

Fix comments.

(Sorting): Add missing quote.

(Sequence Functions): Replace xref to `Vectors' with `Vector Functions'.

Fix help key bindings.

Small fix.

(Mail Methods): Fix xref to Message manual.

(Browse-URL, FFAP): Add information about keywords.

(Completion): Add description for menu items.

Sync keywords with finder.el.

Improve references.

* emacs.texi (Top): Add `Misc X'.

(format-insert-file): Always return a list of two elements,
like insert-file-contents does.

#

(vc-sccs-print-log, vc-sccs-diff): Add optional BUFFER argument.

(vc-rcs-print-log, vc-rcs-diff): Add optional BUFFER argument.

(vc-cvs-print-log, vc-cvs-diff): Add optional BUFFER argument.

(vc-default-workfile-unchanged-p): If the implementation supports it,
let diff output go to *vc*, not *vc-diff*, since this is an internal
call.

Add new optional BUFFER argument to vc-BACKEND-print-log and
vc-BACKEND-diff.
(vc-print-log): If the print-log implementation supports it, use the
new BUFFER argument to direct output to *vc-change-log*, not *vc*.
(vc-version-diff, vc-diff-internal): Doc fixes.

(rx): Work at compile time, not run time.

(cfengine-mode): Set parse-sexp-ignore-comments.

(allout-mode): Fix docstring.

Fix previous change.

(insert-directory): Fix bug if SWITCHES is a list.

(auto-revert-interval): Make new value take effect immediately when
set through Custom.
(auto-revert-set-timer): Add interactive declaration.

* xterm.c (handle_one_xevent): Do not pass key press events to
  GTK.

Fix typos.

Delete previous change.

*** empty log message ***

Add -znocombreloc to LDFLAGS if supported.

Document new :width and :align-to features.

*** empty log message ***

Remove entries for fringe related issues (DONE).
Remove entry about image-relative coordinates of mouse clicks (DONE).

(move_it_in_display_line_to): Fix MOVE_TO_POS case when
to_charpos corresponds to newline in right fringe.  Use local
BUFFER_POS_REACHED_P macro.

xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
to compile on non-window system.

From David Ponce  <david@dponce.com>
(ruler-mode-header-line-format-old): Don't `make-variable-buffer-local'.
(ruler-mode-ruler-function): Default to `ruler-mode-ruler'.
(ruler-mode-header-line-format): Simply funcall the above.
(ruler-mode): Use `make-local-variable' and `kill-local-variable'
to save/restore a previous header line format.
(ruler-mode-space): Don't depend on a numeric WIDTH value.
(ruler-mode-ruler): Use symbolic display elements for scrollbar,
fringes and margins width.
(ruler-mode-ruler-function): Default to ruler-mode-ruler

(hexl-follow-line): Don't require 'fringe.

*** empty log message ***

(hexl-mode-ruler): Adapt to new :align-to semantics.

*** empty log message ***

(Info-default-dirs): Don't ignore last part of I-d-d-l.

(display-time-string-forms): Add help-echo with date on time.

(compose-region): Use restore-buffer-modified-p.

(standard-display-8bit): Simplify.

(server-process-filter): Delete temp frame.

(add-change-log-entry): Simplify.

(Qcenter): Declare here.
(syms_of_xdisp): intern and staticpro it.
(handle_single_display_prop): Allow space display property on all
platforms.
(display_mode_line): Set mode_line_p before displaying line.
(calc_pixel_width_or_height): Declare extern.  Add separate :align-to
handling.  Remove complex cases for fringes and scroll-bars.
Add left, right, and center alignment positions. Add text (area)
width/height.  Return width or height for image specs.
(produce_stretch_glyph): Improve handling of :align-to.  Is now
relative to left of text area by default, but other base offsets
can be specified -- also for text lines.

(produce_glyphs): Handle IT_STRETCH.
(produce_stretch_glyph): New function to handle space width and
align-to display properties on non-window systems.

(Qcenter): Move to xdisp.c.

(calc_pixel_width_or_height): Add prototype.

*** empty log message ***

(compilation-start): Always set compilation-last-buffer and return it.

(tex-shell): Set error parsing function here.
(tex-send-tex-command): Rather than here.
(tex-compilation-parse-errors): Simplify.

(log-edit-font-lock-keywords): Typo.

*** empty log message ***

*** empty log message ***

(Fread_file_name): Set completion-ignore-case for case-insensitive systems.

(clone-buffer): Doc fix.

(log-edit-font-lock-keywords): New var.
(log-edit-mode): Use it.

(Advanced): Replace @unnumberedsubsec by @subheading (as suggested by
Karl Berry).  Update information about colored stars in menus.  Add
new subheading describing M-n.