Throughout the file, delete all USE_FONT_BACKEND
conditionals.  Don't check enable_font_backend. Surround non-used
code by "#ifdef OLD_FONT" and "endif".
(FONT_WIDTH, FONT_HEIGHT, FONT_BASE, FONT_DESCENT)
(FONT_AVG_WIDTH): Adjusted for the change of struct font.

: Throughout the file, delete all USE_FONT_BACKEND
conditionals.  Don't check enable_font_backend.  Delete all codes
used only when USE_FONT_BACKEND is not defined.  Surround non-used
code by "#ifdef OLD_FONT" and "endif".

Delete USE_FONT_BACKEND conditional.
(uniscribe_open): Return value changed to font-object.  Adjusted
for the format change of font-object.
(uniscribe_otf_capability): Adjusted for the change of struct
font.
(add_opentype_font_name_to_list): Don't downcase names.
(uniscribe_font_driver): Adjusted for the change of struct
font_driver.

Throughout the file, delete all USE_FONT_BACKEND
conditionals.
(FONT_WIDTH): Return (f)->max_width.
(struct x_display_info): Delete member `font'.
(x_list_fonts, x_get_font_info, x_load_font, x_query_font)
(x_find_ccl_program, x_get_font_repertory): Delete externs.
(struct x_output): Change type of `font' to `struct font *'.

(update_frame_1): Check if tty output is still valid before flushing
it.

* dispnew.c (update_frame_1): Check if tty output is still valid
before flushing it.

(define-ibuffer-filter filename): Use `ibuffer-buffer-file-name'.

(ibuffer-buffer-file-name): New function.
(define-ibuffer-column filename): Use it.

(talk): Simplify.  Pass display arg to talk-add-display as a string.
(talk-add-display): Simplify.  Accept only string args.

* talk.el (talk): Simplify.  Pass display arg to talk-add-display
as a string.
(talk-add-display): Simplify.  Accept only string args.

(calc-mode-map): Remove old keybinding for `calc-yank'.

(bootstrap-prepare): Don't chmod files.
(autoloads): Do it here instead, where it's actually needed.

(tool-bar-make-keymap): Additional minor fix.

* tool-bar.el (tool-bar-make-keymap): Account for the optional
KEY-BINDING-DATA field in menu-item list.

(tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
field in menu-item list.

(Lisp Atoms): Rephrase "in addition" to avoid confusion with addition
operation discussed in previous paragraph.

* emacs-lisp-intro.texi (Lisp Atoms): Rephrase "in addition" to
avoid confusion with addition operation discussed in previous
paragraph.

(dired-read-dir-and-switches): Move things about to use less
recursion during macroexpansion.

* dired.el (dired-read-dir-and-switches): Use read-file-name.

(handle_one_xevent): Don't pass buttons higher than 3
to Gtk+ menus.

(file_name_completion): Tweak the code so as to always do it
in a single pass.  Tighten the scope of some variables.

(dired-read-dir-and-switches): Ignore ., .., and
completion-ignored-extension directories if there's something else.
(dired-mark-if, dired-map-over-marks, dired-readin, dired-revert)
(dired-remember-marks, dired-undo, dired-build-subdir-alist)
(dired-internal-do-deletions, dired-mark-files-in-region, dired-mark)
(dired-toggle-marks, dired-change-marks, dired-unmark-all-files):
buffer-read-only -> inhibit-read-only.

(Qdefault_directory): New var.
(file_name_completion): Use it instead of Fexpand_file_name.
(syms_of_dired): Initialize it.

*** empty log message ***

Tell (vc-expand-dirs) not to throw out explicitly specified files.

(double_dollars): Remove dead code.

(smerge-apply-resolution-patch): Don't pass nil to `insert'.

Re-add Todo item about merging.

(with-vc-file, edit-vc-file): Remove unused macros.

(vc-annotate-show-diff-revision-at-line): Remove incorrect
cons.  Use vc-annotate-backend.

Add autoload for
`auth-source-user-or-password'.
(smtpmail-try-auth-methods): Use it.

Add autoload cookie for
`auth-source-user-or-password'.
(url-basic-auth, url-digest-auth): Use it with any realm,
overriding the user name and password before the prompt.

Comment.

(cl-set-nthcdr): Make it a defsubst so that
(setf (nthcdr ..) ..) doesn't require CL at runtime.

* org/org.el (org-modules): Repair problems with loading
org-jsinfo.org.

*** empty log message ***

(vc-bzr-sha1, vc-bzr-command-discarding-stderr)
(vc-bzr-revision-completion-table): Use process-file.
(vc-bzr-working-revision): Pass relative file names.

(diff-hunk-header-re): Refine the regexp.

(Info-next-preorder): Let-bind `Info-history' to nil
before recursive call to `Info-next-preorder' to not add
intermediate nodes to the history.

Put isearch-scroll property on cua-scroll-up and cua-scroll-down.

Put isearch-scroll property on recenter-top-bottom.

(widget-image-directory): Change default image data
subdirectory from "custom" to "images/custom".

*** empty log message ***

(smerge-start-session): Revert unintended change in 2008-05-10T13:06:33Z!Reiner.Steib@gmx.de.

Initial revision.

Re-fill copyright years.
Re-fix permissions notice.

Reorganize to-do list.

Remove dead code.

Fix typo.

Typo fix.

Prevent some compilaation warnings.

*** empty log message ***

(ewoc): Require.

(vc-hooks, ewoc): Require.
(vc-log-edit, vc-buffer-sync): Declare for byte compiler.

(vc-hg-diff, vc-hg-annotate-command): Use when not if.

Tweak last change.

(x-colors): Re-order colors.

* term/w32-win.el (x-colors):
* term/mac-win.el (x-colors):
* term/x-win.el (x-colors): Re-order colors.

Remove assumption about what nil means as a first arument to vc-do-command.

(smerge-command-prefix): Fix custom type.

New functions implementing motion to next and previous directory.

(Windows Files): Update documentation of w32-get-true-file-attributes.

(Ffile_attributes, Fdirectory_files_and_attributes): Mention
w32-get-true-file-attributes in doc string.

(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.

Fix last change.

Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1153

Update todo.

* vc-sccs.el (vc-sccs-dir-status):
* vc-rcs.el (vc-rcs-dir-status): Avoid using results from multiple
backends and returning up to date files.

(vc-prefix-map): Remove duplicate binding.

Switch to recommended form of GPLv3 permissions notice.

Switch to recommended form of GPLv3 permissions notice.

(Fread_file_name): Remove reference to insdef, deleted 2008-04-23.

Note that vc.el now uses this.

Include sys/types.h, sys/stat.h, and errno.h.
(IS_DIRECTORY_SEP): New macro.
(convert_time, is_exec, stat): New functions.

Item said "vc-update/vc-merge should deal with VC systems that don't
update/merge on a file basis, but on a whole repository basis." That's
what selecting the top-level directory of the repo or working copy is
for.

Remove two to-dos.

Dupport an use an observer flag in (vc-dispatcher-selection-set).

VC directory bindings are noew documented.

Document the new VC directory mode.

Suppress an annoying warning.

(stat): Fix last change.

Support for reporting owner and group of each file on MS-Windows:
* dired.c (stat_uname, stat_gname): New functions, with special
implementation for w32.
(Ffile_attributes): Use them instead of getpwuid and getgrgid.

* w32.c:
(g_b_init_get_file_security, g_b_init_get_security_descriptor_owner)
(g_b_init_get_security_descriptor_group, g_b_init_is_valid_sid):
New initialization states.
(globals_of_w32): Initialize them to zero.  Initialize the default
group name to "None".
(GetFileSecurity_Name): New global var, the name of the function
to call for GetFileSecurity.
(GetFileSecurity_Proc, GetSecurityDescriptorOwner_Proc)
(GetSecurityDescriptorGroup_Proc, IsValidSid_Proc): New typedefs.
(get_file_security, get_security_descriptor_owner)
(get_security_descriptor_group, is_valid_sid)
(get_file_security_desc, get_rid, get_name_and_id)
(get_file_owner_and_group): New functions.
(stat): Use get_file_security_desc and get_file_owner_and_group to
report the owner and primary group of each file.  Don't ignore the
high 32 bits of file's size, now that st_size is 64-bit wide.  Fix
test when to get true file attributes.
(init_user_info): Use get_rid instead of equivalent inline code.
(fstat): Don't ignore the high 32 bits of file's size.

(struct stat): Move st_dev after st_ino, for better alignment.
Make st_size 64-bit wide.  Add new members st_uname and st_gname.

Comment and to-do list fixes.

Remove the vc-dir-insert-directories global.

Teach the RCS back end to do directories.

* simple.el (start-file-process): Clarify docstring.

*** empty log message ***

Remove wash-log from the VC backend API.

* vc.el (vc-mark-resolved): Add `backend' argument.
(vc-next-action): Pass it the backend.
(vc-next-action, vc-checkout, vc-mark-resolved, vc-version-diff)
(vc-merge, vc-rollback, vc-update, vc-transfer-file, vc-delete-file)
(vc-default-comment-history, vc-default-create-snapshot)
(vc-default-retrieve-snapshot, vc-default-revert, vc-annotate)
(vc-annotate-revision-previous-to-line)
(vc-annotate-show-diff-revision-at-line, vc-annotate-warp-revision):
* vc-svn.el (vc-svn-checkout):
* vc-mcvs.el (vc-mcvs-checkout):
* vc-hooks.el (vc-state, vc-default-workfile-unchanged-p)
(vc-working-revision, vc-before-save, vc-mode-line):
Prefer vc-call-backend to vc-call so as not to recompute the backend.

Make SCCS backend directory-aware.

(vc-deduce-fileset): Don't require the checkout-model and the
state to be consistent since it's often an unwarranted restriction.
Don't return the state either.
(vc-next-action): Check that the state is consistent.
(vc-diff-internal, vc-version-diff, vc-print-log, vc-revert)
(vc-rollback, vc-update): Adapt to new return value of vc-deduce-fileset.

(vc-dispatcher-selection-set): More typos, plus indentation.

(vc-dispatcher-selection-set): Typo.

(vc-dispatcher-browsing): Use derived-mode-p.
(vc-dir-prepare-status-buffer): Use vc-dispatcher-browsing.
(vc-dispatcher-in-fileset-p): New fun.
(vc-dispatcher-selection-set): Use it to properly handle directories.

*** empty log message ***

(struct group): Add gr_gid member.

Rename the_passwd_* to dflt_passwd_*.
(dflt_group_name): New static variable.
(dflt_group): Renamed from the_group.
(init_user_info): Init dflt_group fields.  Get user's group name
from LookupAccountSid.

(vc-version-diff, vc-print-log, vc-revert, vc-rollback)
(vc-update): Remove unused let bindings.

Switch to recommended form of GPLv3 permissions notice.