(bookmark-set): Make the bookmark before reading annotations.
I.e. use bookmark-edit-annotation rather than bookmark-read-annotation.
(bookmark-read-annotation-mode-map, bookmark-annotation-paragraph)
(bookmark-annotation-buffer, bookmark-annotation-file)
(bookmark-annotation-point, bookmark-send-annotation)
(bookmark-read-annotation-mode, bookmark-read-annotation): Remove.
(bookmark-edit-annotation-text-func): Rename from
bookmark-read-annotation-text-func.  Keep old name as an obsolete alias.
(bookmark-edit-annotation-mode-map): Move initialization into declaration.

Add spurious * in docstrings.
(bookmark-minibuffer-read-name-map): New var.
(bookmark-set): Use it.  Also pass the default value as it should.
(bookmark-send-edited-annotation): Take no chances with text properties.
(bookmark-insert-current-bookmark): Inline bookmark-insert-buffer-name.
(bookmark-insert-buffer-name): Remove.
(bookmark-buffer-file-name): Signal an error rather than returning nil.

(url-http-chunked-encoding-after-change-function):
Remove superfluous CRLF at end of file.  (bug #42)

(diary-list-entries): Fix typo in previous doc fix.

(diary-list-entries): Doc fix.
(diary-list-entries, include-other-diary-files, fancy-diary-display):
Use let where let* is not needed.
(fancy-diary-display): Simplify setting of `date-holiday-list'.

(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-holidays): Restore autoload cookies, because people are
used to using these variables without loading calendar.el.

(tutorial--default-keys): Update `C-l' binding.

(diff-mode-menu): Add :help.

(diary-islamic-date): Move to end.
(date, number): Declare where needed.

(nongregorian-diary-marking-hook, list-sexp-diary-entries): Doc fixes.
(diary-list-entries): Doc fix.  Remove free variable `entry'.
(fancy-diary-display): Use dolist, bobp.  Remove free variable `entry'.
(mark-diary-entries): Remove free variable `entry'.

* bookmark.el (bookmark-make): Don't pass the `annotation' to the
make-record function, instead paste it in afterwards.
(bookmark-make-record-for-text-file):
* doc-view.el (doc-view-bookmark-make-record):
* info.el (Info-bookmark-make-record): Don't mess with annotations.

(entry): Declare for compiler part-way through.
Comments.

Add doc-strings to all functions.
(timeclock-workday, timeclock-in, timeclock-completing-read): Doc fixes.
(timeclock-entry-list-length, timeclock-entry-list-projects)
(timeclock-day-list-projects, timeclock-day-list): Use dolist.

(hebrew-calendar-leap-year-p)
(hebrew-calendar-elapsed-days, hebrew-calendar-long-heshvan-p)
(hebrew-calendar-short-kislev-p, mark-hebrew-diary-entries)
(insert-hebrew-diary-entry, insert-monthly-hebrew-diary-entry)
(insert-yearly-hebrew-diary-entry, diary-yahrzeit): Doc fixes.

(calendar-location-name, calendar-latitude)
(calendar-longitude, solar-setup, solar-sin-degrees)
(solar-cosine-degrees, solar-tangent-degrees, solar-xy-to-quadrant)
(solar-degrees-to-quadrant, solar-atn2, solar-arccos)
(solar-sunrise-and-sunset, solar-moment, solar-daylight)
(solar-exact-local-noon, solar-julian-ut-centuries)
(solar-ephemeris-time, solar-date-next-longitude)
(solar-horizontal-coordinates, solar-equatorial-coordinates)
(solar-ecliptic-coordinates, solar-data-list, solar-longitude)
(solar-ephemeris-correction, solar-sidereal-time, solar-date-to-et)
(sunrise-sunset, solar-seasons-data, solar-equinoxes/solstices):
Doc fixes.
(solar-horizontal-coordinates, solar-equatorial-coordinates)
(solar-ecliptic-coordinates): Rename argument `for-sunrise-sunset'.
(solar-ecliptic-coordinates): Use unless.
(calendar-sunrise-sunset, diary-sunrise-sunset, diary-sabbath-candles):
Use or.

(diary-list-entries, include-other-diary-files, mark-diary-entries)
(mark-sexp-diary-entries, mark-included-diary-files)
(diary-entry-time, list-sexp-diary-entries): Remove the special
handling of ^M that dates back to the use of selective-display.
(simple-diary-display): Obey setting of pop-up-frames.
(body, entry): Remove unnecessary declarations.

(GET_NEXT_DISPLAY_ELEMENT): New macro.
(get_next_display_element, next_element_from_string)
(next_element_from_ellipsis, next_element_from_buffer): Use it.

*** empty log message ***

* bookmark.el (bookmark-prop-get, bookmark-prop-set): New funs.
(bookmark-get-annotation, bookmark-set-annotation)
(bookmark-get-filename, bookmark-set-filename, bookmark-get-position)
(bookmark-set-position, bookmark-get-front-context-string)
(bookmark-set-front-context-string, bookmark-get-rear-context-string)
(bookmark-set-rear-context-string, bookmark-get-handler): Use them.
* info.el (Info-bookmark-make-record): Don't bother recording point.
(bookmark-get-filename, bookmark-get-front-context-string)
(bookmark-get-rear-context-string, bookmark-get-position): Don't declare.
(bookmark-get-info-node): Remove.
(bookmark-prop-get): Declare.
(Info-bookmark-jump): Use it.

(chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
(chinese-calendar-daylight-savings-starts)
(chinese-calendar-daylight-savings-ends)
(chinese-calendar-daylight-savings-starts-time)
(chinese-calendar-daylight-savings-ends-time)
(chinese-zodiac-sign-on-or-after, chinese-new-moon-on-or-after):
Doc fixes.

(diary-bahai-mark-entries)
(diary-bahai-insert-entry, diary-bahai-insert-monthly-entry)
(diary-bahai-insert-yearly-entry): Doc fixes.

Formatting changes only.

Formatting changes only.

(appt-disp-window, appt-convert-time): Doc fixes.

Formatting changes only.

Formatting changes only.

(holidays): Doc fix.

Formatting changes only.

(cal-menu-holiday-window-suffix)
(cal-menu-x-popup-menu, calendar-mouse-holidays)
(calendar-mouse-view-diary-entries, calendar-mouse-print-dates)
(calendar-mouse-goto-date): Doc fixes.
(cal-menu-set-date-title): Move definition before use.

(islamic-calendar-leap-year-p)
(list-islamic-diary-entries, mark-islamic-diary-entries)
(insert-islamic-diary-entry, insert-monthly-islamic-diary-entry)
(insert-yearly-islamic-diary-entry): Doc fixes.

Formatting changes only.

Formatting changes only.

(calendar-next-time-zone-transition, calendar-time-zone): Doc fixes.

(phases-of-moon, lunar-new-moon-on-or-after): Doc fixes.

(calendar-string-to-mayan-long-count)
(calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string)
(calendar-read-mayan-haab-date, calendar-read-mayan-tzolkin-date)
(calendar-next-calendar-round-date)
(calendar-mayan-long-count-common-era): Doc fixes.

(calendar-scroll-left, calendar-scroll-right): Doc fix.

(date-to-time, time-subtract, time-add, safe-date-to-time): Doc fixes.

Add more simple TODOs.

(french-calendar-month-name-array)
(french-calendar-day-name-array, french-calendar-special-days-array):
Add doc strings.

Formatting changes only.

(calendar-iso-read-args): Doc fix.

(calendar-frame-parameters, calendar-and-diary-frame-parameters): Fix
previous change.
(calendar-one-frame-setup, calendar-only-one-frame-setup)
(calendar-two-frame-setup): Doc fix.

Fix previous change.

(while-no-input): Don't splice BODY directly into the `or' form.

Update for change of `mail-source-delete-incoming'
Mention problem with coding system `utf-8-emacs' when using different Emacs
versions.

(struct Lisp_Process): Declare bit fields as unsigned.

(diff-ignore-whitespace-hunk): Bind
inhibit-read-only before trying to change the buffer.

Regenerate.

(calendar-bahai-prompt-for-date, calendar-bahai-mark-date-pattern):
Use zerop.

Comment.

(coptic-name): Add doc string.
Comments.

Comment.

(mark-hebrew-calendar-date-pattern): Use zerop.

(mark-islamic-calendar-date-pattern): Use zerop.
Comments.

Comments.

(calendar-absolute-from-julian): Use zerop.
Comments.

Comments.

(persian-calendar-month-name-array, persian-calendar-epoch): Make constants.
(persian-prompt-for-date): Use zerop.

(diary-frame-parameters, calendar-frame-parameters)
(calendar-and-diary-frame-parameters, calendar-after-frame-setup-hooks):
Make defcustoms.

Comment.

(calendar-insert-indented): Doc fix.  Use when rather than if.
(exit-calendar): Use mapc rather than mapcar.
(calendar-cursor-to-date): Use zerop.

Comment.

Remove un-needed eval-when-compile.

Unquote lambda functions.

Move defcustoms to start.
(diary-include-string, diary-list-include-blanks)
(diary-glob-file-regexp-prefix, diary-face, diary-face-attrs)
(diary-file-name-prefix, diary-file-name-prefix-function)
(sexp-diary-entry-symbol, list-diary-entries-hook)
(mark-diary-entries-hook, nongregorian-diary-listing-hook)
(nongregorian-diary-marking-hook, print-diary-entries-hook):
Move here from calendar.el.
(diary-face): Make it a defcustom, and mark as obsolete.
(top-level): No need to require cal-hebrew, cal-islam when compiling.
(calendar-hebrew-month-name-array-leap-year)
(calendar-islamic-month-name-array, calendar-bahai-month-name-array):
Define for compiler.
(diary-font-lock-keywords): Use format rather than concat. Add
bahai-diary-entry-symbol.

Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.

Add autoload cookies to functions formerly autoloaded in calendar.el.
Set `generated-autoload-file' to "cal-loaddefs.el".

Add autoload cookies to functions formerly autoloaded in calendar.el.
Set `generated-autoload-file' to "cal-loaddefs.el".
(calendar-tex): Move custom group here from calendar.el.

Unquote lambda functions.  Add autoload cookies to functions formerly
autoloaded in calendar.el.  Set `generated-autoload-file' to
"cal-loaddefs.el".

New file.

Unquote lambda functions.  Add autoload cookies to functions formerly
autoloaded in calendar.el.  Set `generated-autoload-file' to
"cal-loaddefs.el".

Add autoload cookies to functions formerly autoloaded in calendar.el.
Set `generated-autoload-file' to "cal-loaddefs.el".

Unquote lambda functions.

Unquote lambda functions.  Add autoload cookies to functions formerly
autoloaded in calendar.el.  Set `generated-autoload-file' to
"cal-loaddefs.el".

Comment.

Unquote lambda functions.  Add autoload cookies to functions formerly
autoloaded in calendar.el.  Set `generated-autoload-file' to
"cal-loaddefs.el".

Unquote lambda functions.  Add autoload cookies to functions formerly
autoloaded in calendar.el.  Set `generated-autoload-file' to
"cal-loaddefs.el".
(chinese-calendar): Move custom group here from calendar.el.
(chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Make constants.

Unquote lambda functions.  Add autoload cookies to functions formerly
autoloaded in calendar.el.  Set `generated-autoload-file' to
"cal-loaddefs.el".

(appt): Move custom group here from calendar.el.

(list-diary-entries-hook): Declare for compiler.
(org-get-entries-from-diary): Require diary-lib.

Move declare-function.

(bookmark-make-name-function, bookmark-get-bookmark-record):
Pacify byte-compiler.

(c-in-knr-argdecl): Limit number of paren/bracket pairs parsed, to solve
performance problem.

(Limitations and Known Bugs): State that the number of parens/brackets in
a k&r region is limited.

*** empty log message ***

* 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.