* bookmark.el (bookmark-set): Don't check for
`bookmark-make-name-function' since `bookmark-buffer-file-name'
already takes care of this.
(bookmark-buffer-name): Removed Info-mode specific code.
(bookmark-buffer-file-name): Removed Info-mode specific code.

* info.el (bookmark-get-info-node): Define this function in
info.el, not in bookmark.el.
(Info-mode): Set `bookmark-make-name-function' to
`Info-bookmark-make-name' locally.
(Info-bookmark-make-name): New function.

* bookmark.el (bookmark-make-name-function): New variable.

* emacs-cvs/lisp/bookmark.el
  (bookmark-set): Make `bookmark-make-record-function' buffer-local,
  not `bookmark-make-cell-function' (the old name).

(Info-bookmark-make-record): Delete obsolete second arg.

(image-bookmark-make-record): Delete obsolete
second arg.

(doc-view-bookmark-make-record): Delete obsolete
second arg.

*** empty log message ***

(vc-status-menu-map-filter): Return orig-binding if
boundp 'vc-ignore-menu-filter.
(vc-status-tool-bar-map): Make it defvar.
(vc-status-mode): vc-status-tool-bar-map now variable.
(vc-status-toggle-mark): toggle-mark-file => vc-status-toggle-mark-file.

Change a return type, for greater extensibility.  See
http://lists.gnu.org/archive/html/emacs-devel/2007-12/msg01077.html
and its thread for discussion leading to this change.

* emacs-cvs/lisp/bookmark.el:
(bookmark-jump-noselect): Return an alist instead of a dotted pair.
(bookmark-jump, bookmark-jump-other-window, bookmark-insert)
(bookmark-bmenu-2-window, bookmark-bmenu-other-window)
(bookmark-bmenu-switch-other-window): Adjust accordingly.
(bookmark-make-cell-function): Adjust documentation accordingly.

* emacs-cvs/lisp/image-mode.el
(image-bookmark-jump): Adjust return type accordingly; document.

* emacs-cvs/lisp/doc-view.el
(doc-view-bookmark-jump): Adjust return type accordingly; document.

Regenerate.

Remove leading `*' from defcustom doc-strings.
(calendar-time-display-form, calendar-latitude)
(calendar-longitude, solar-equinoxes-solstices): Remove autoload cookies.
(calendar-latitude, calendar-longitude): Move functions after
variables.
(diary-sabbath-candles-minutes): Move to start.
(solar-setup): Use or rather than if.
(solar-sin-degrees, solar-cosine-degrees, solar-tangent-degrees):
Remove condition-case.
(solar-atn2): Use zerop.
(solar-equinoxes-solstices): Doc fix.

(calendar-dst): New custom group.
(calendar-daylight-savings-starts, calendar-daylight-savings-ends)
(calendar-time-zone, calendar-daylight-time-offset)
(calendar-standard-time-zone-name, calendar-daylight-time-zone-name)
(calendar-daylight-savings-starts-time)
(calendar-daylight-savings-ends-time): Convert from defvar to defcustom.
(calendar-daylight-savings-starts, calendar-daylight-savings-ends):
Move to start.

(calendar-version): Use emacs-version and make it obsolete.  Move to end.
(calendar-offset, view-diary-entries-initially)
(mark-diary-entries-in-calendar)
(calendar-remove-frame-by-deleting)
(view-calendar-holidays-initially, all-hebrew-calendar-holidays)
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays, calendar-load-hook)
(initial-calendar-window-hook, today-visible-calendar-hook)
(today-invisible-calendar-hook, calendar-move-hook)
(diary-nonmarking-symbol, hebrew-diary-entry-symbol)
(islamic-diary-entry-symbol, bahai-diary-entry-symbol)
(diary-include-string, sexp-diary-entry-symbol)
(abbreviated-calendar-year, american-date-diary-pattern)
(european-date-diary-pattern, european-calendar-display-form)
(american-calendar-display-form, print-diary-entries-hook)
(list-diary-entries-hook, diary-hook, diary-display-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks)
(holidays-in-diary-buffer, general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays-1)
(hebrew-holidays-2, hebrew-holidays-3, hebrew-holidays-4)
(hebrew-holidays, christian-holidays, islamic-holidays)
(bahai-holidays, solar-holidays, calendar-setup)
(calendar-week-start-day): Remove autoload cookies.
(diary-glob-file-regexp-prefix): Doc fix.
(calendar-goto-info-node): Use `info' rather than `Info-find-node'.
(Info-find-emacs-command-nodes, Info-find-node): Remove declarations.
(calendar-week-start-day, calendar-debug-sexp): Move to start.

* bookmark.el (bookmark-map, bookmark-read-annotation-mode-map):
Move initialization into declaration.
(bookmark-get-info-node, bookmark-set-info-node): Remove.
(bookmark-make, bookmark-make-cell-for-text-file): Remove `info-node' arg.
(bookmark-info-current-node): Remove.
(bookmark-jump-noselect): Rename from bookmark-jump-internal.
Add relocation fallback.  Set bookmark-current-bookmark.
(bookmark-default-handler): Rename from bookmark-jump-noselect.
Remove relocation fallback.  Don't set bookmark-current-bookmark.
(bookmark-set): Let it be used even if there's no buffer-file-name
as long as there is a bookmark-make-cell-function.
* info.el (Info-bookmark-jump): Remove relocation fallback.
Don't set bookmark-current-bookmark.

(holidays-in-diary-buffer): Declare for compiler.

Remove leading `*' from defcustom doc-strings.

(appt-issue-message)
(appt-message-warning-time, appt-audible, appt-visible)
(appt-msg-window, appt-display-mode-line, appt-display-duration)
(appt-display-diary): Remove autoload cookies.

Remove leading `*' from defcustom doc-strings.
(sc-mode-map-prefix): Doc fix.  Make it a defcustom.

(org-agenda-sunrise-sunset): Require solar.
(calendar-longitude, calendar-latitude, calendar-location-name):
Declare for compiler.

Fix merge mistakes (correct date, add missing entries).

http://lists.gnu.org/archive/html/emacs-devel/2008-03/msg00225.html

(w32_registry): Take font_type argument. Use ANSI
when charset not specified. Only translate ANSI to unicode when
font_type is truetype.
(w32font_coverage_ok): New function.
(add_font_entity_to_list): Use it to filter unsuitable fonts.

(archive-ar-file-header-re): New const.
(archive-ar-summarize, archive-ar-extract): New funs.
(archive-find-type): Recognize ar archives.

(vc-bzr-resolve-when-done, vc-bzr-find-file-hook): New functions.

(Info-bookmark-make-cell): Fix up last change.

(Info-bookmark-make-cell): Don't use the info-node argument.

* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Bugfix: replaced
:enable (mark-active) with :enable mark-active.  Thanks to Lennart
Borgman.

*** empty log message ***

*** empty log message ***

(org-export-html-style): Doc fix.
(org-get-legal-level): New obsolete alias.
(org-get-valid-level): Rename from `org-get-legal-level'.
(org-promote, org-demote, org-archive-subtree, org-remember-handler,
org-refile, org-put-clock-overlay): Use it.

(calendar-date-is-legal-p): New obsolete alias.
(calendar-date-is-valid-p): Rename from `calendar-date-is-legal-p'.
(calendar-date-is-visible-p, mark-visible-calendar-date): Use it.

(make-legal-file-name): New obsolete alias.
(make-valid-file-name): Rename from `make-legal-file-name'.
(make-auto-save-file-name): Use it.

New files.

Update with bookmark_add.

(x-gtk-stock-map): Add bookmark_add.

(vc-status-tool-bar-map, vc-status-toggle-mark-file)
(vc-status-toggle-mark): New functions.
(vc-status-mode): Set tool bar map.

*** empty log message ***

(Hiding Subdirectories): Fix previous change.

(parens-require-spaces): Doc fix.
Reported by Drew Adams <drew.adams@oracle.com>.

* emacs-lisp/lisp.el (parens-require-spaces): Doc fix.
Reported by Drew Adams <drew.adams@oracle.com>.

Regenerate.

Regenerate.

(USE_FONT_BACKEND): Set to "no" in absence of X.
(PKG_CONFIG): Don't set multiple times, once is enough.
(HAVE_FREETYPE, HAVE_LIBOTF, HAVE_M17N_FLT): Tweak config.in text.

Update font-backend section.

* dired.texi (Hiding Subdirectories): Documented `dired-hide-subdir'.

(epg-context-include-certs): Reflow docstring.
(epg-start-sign-keys, epg-sign-keys, epg-context-armor, epg-context-signers,
epg-context-sig-notations, epg-context-set-armor, epg-context-set-signers,
epg-context-set-sig-notations, epg-make-import-status, epg-make-import-result,
epg-start-delete-keys): Fix typos in docstrings.
(epg-start-sign-keys, epg-sign-keys): Fix typos in obsolescence declarations.

Don't check for `cadr' and `last'.
(iswitchb-define-mode-map, iswitchb-default-keybindings):
Add obsolescence declaration and remove redundant info from docstring.
(iswitchb-set-common-completion, iswitchb-set-matches,
iswitchb-get-matched-buffers, iswitchb-visit-buffer): Use `let'.
(recentf-list, most-len, most-is-exact):
Don't wrap defvars within `eval-when-compile'.

Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
(ediff-select-lowest-window): Use when rather than if.
(ediff-setup-control-frame): Remove
ediff-cond-compile-for-xemacs-or-emacs, since it is already inside
a (featurep 'xemacs) test.

Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
(ediff-kill-bottom-toolbar): Place (ediff-use-toolbar-p) test inside
XEmacs test.
(ediff-make-bottom-toolbar): Place whole cond inside XEmacs test,
since it was doing nothing on Emacs.
(ediff-make-bullet-proof-overlay): Use when rather than if.

Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
(ediff-cond-compile-for-xemacs-or-emacs): Remove.
(top-level, ediff-frame-iconified-p): Simplify if+and to just and.
(ediff-read-event, ediff-overlayp, ediff-make-overlay, ediff-delete-overlay):
Move the XEmacs test inside the definition.

Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
(ediff-cond-compile-for-xemacs-or-emacs): Remove.
(ediff-window-setup-function): Don't autoload declaration for compiler.
(ediff-xemacs-init-menus): Use when rather than if.

Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.
(ediff-get-meta-info): Use or and unless rather than if.

Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.

(char_resolve_modifier_mask): Fix previous change.

(read-quoted-char): Resolve modifers of the character event.

(Fread_char): Resolve modifiers.
(Fread_char_exclusive): Likewise.

(calc-extended-command-history): New variable.
(calc-exectute-extended-command): Use `calc-extended-command-history'.

(char_resolve_modifier_mask): Fix previous change
(Fchar_resolve_modifiers): New function.
(syms_of_character): Declare Fchar_resolve_modifiers as Lisp
function.

* bindings.el (mode-line-remote): Add mouse-face.  Improve tooltip.
(standard-mode-line-position): Add mouse-face.

* progmodes/compile.el (compilation-menu-map):
(compilation-mode-map):
* progmodes/grep.el (grep-mode-map):  Add :help.

* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Define and
initialize in one step.  Add :help.  Use :enable to activate menu
items. Show the key binding for edebug-defun.
(lisp-interaction-mode-map): Add a menu.

* term.el (term-mode-map): Define and initialize in one step.

* ediff-init.el (ediff-color-display-p): Simplify.
(Xor): Remove unused function.
(ediff-with-syntax-table): Simplify for emacs.

* ediff-hook.el (menu-bar-ediff-menu): Don't depend on the
menu-bar being loaded, it always is.

(tex-mode): Suppress warning about multiple definitions when compiling.

(gnus-article-mode-line-format-alist): Move here from gnus-art.
(top-level): No need to load own source when compiling.

(gnus-article-mode-line-format-alist): Move to gnus-sum.

Update for font-backend being enabled by default.

Regenerate.

Enable font-backend by default.

(char_resolve_modifier_mask): New function.
(char_string): Use char_resolve_modifier_mask.

(comint-exec-1): Don't change the coding-system for
decoding to dos-like EOL.
(comint-carriage-motion): Fully rewrite.

(c-neutralize-syntax-in-CPP): Fix coding bug.

(c-before-font-lock-function): Fix bug in doc-string, "c-old-LEN" ->
"c-old-END".

*** empty log message ***

(FONT_CFLAGS): New optional compiler flag.
(EMACS_EXTRA_C_FLAGS): Include it.

* gmake.defs, nmake.defs (FONT_CFLAGS): New optional compiler flag.
(EMACS_EXTRA_C_FLAGS): Include it.
* configure.bat (usefontbackend): Default to Y.
(--enable-font-backend): Replace with --disable-font-backend.
(:withfont): Replace with :withoutfont.

Always include w32font.c in the build.

Wrap in USE_FONT_BACKEND conditional

(clean): Remove emacs-*.*.* instead of emacs-*.
(versionclean): Likewise.

(rng-preferred-prefix-alist): Add dublin core namespaces.

Add oo.

Add oo.

(top-level): No need to require gnus when compiling,
since unconditionally required near start of file.
(gnus-summary-display-while-building): Move definition before use.

(ediff-clear-fine-diff-vector): Use mapc rather than mapcar.

(tex-cmd-bibtex-args): Add :version and :group.

(decode_coding_object): Inhibit gap shrinking while
decoding in place.

Full alpha for 32x32 full color.  Add 32x32 and 16x16 256 color versions.

Fix line ends.

*** empty log message ***

Fix format.

New file.

Make transperency 8 bit

(byte-compile-trueconstp, byte-compile-nilconstp): No recursion in defsubst.

(latex-mode): Remove % from paragraph-separate so that M-q can fill comments.
(tex-executable-exists-p, tex-compile): Extend with special syntax for
commands implemented in elisp.
(tex-compile-commands): Add an entry to use doc-view for pdf files.
(tex-format-cmd): New function.
(tex-compile): Use it to let the user specify default arguments.
(tex-cmd-bibtex-args): New var.
(tex-cmd-doc-view): New function.

*** empty log message ***

(face-spec-set): Fix typos in docstring.

Restore info for emacs.ico under new name emacs22.ico.

Restore r1.3 of emacs.ico as emacs22.ico

Update icons entry.

Restore the old info for emacs.png under the new name emacs22.png.

Restore r1.1 of emacs.png as emacs22.png

(mode-line-column-line-number-mode-map): New variable.
(standard-mode-line-position): Use it to add a menu for toggling
column number and line number display.

* w32term.c: Remove unused include "gnu.h".
* makefile.w32-in (w32term.o): Don't depend on gnu.h

* gnu.h: Rename to ...
* emacs-icon.h: ... this.
* xterm.c: Use emacs-icon.h instead of gnu.h.
* Makefile (xterm.o): Depend on emacs-icon.h, not gnu.h.

(nndoc-oe-dbx-type-p): Use mm-string-to-multibyte.

(mm-decode-content-transfer-encoding): Simplify.

Use inhibit-read-only and with-current-buffer.
(gnus-summary-jump-to-group): Consider windows on other displayed frames as
well.  Similar changes might be needed elsewhere, but that's the one I've
bumped into during my use.